Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
7b84b29b
Commit
7b84b29b
authored
Apr 18, 2011
by
Benjamin Herrenschmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
powerpc/powermac: Build fix with SMP and CPU hotplug
Signed-off-by:
Benjamin Herrenschmidt
<
benh@kernel.crashing.org
>
parent
86c74ab3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
arch/powerpc/platforms/powermac/smp.c
arch/powerpc/platforms/powermac/smp.c
+5
-3
No files found.
arch/powerpc/platforms/powermac/smp.c
View file @
7b84b29b
...
@@ -842,6 +842,7 @@ static void __devinit smp_core99_setup_cpu(int cpu_nr)
...
@@ -842,6 +842,7 @@ static void __devinit smp_core99_setup_cpu(int cpu_nr)
mpic_setup_this_cpu
();
mpic_setup_this_cpu
();
}
}
#ifdef CONFIG_PPC64
#ifdef CONFIG_HOTPLUG_CPU
#ifdef CONFIG_HOTPLUG_CPU
static
int
smp_core99_cpu_notify
(
struct
notifier_block
*
self
,
static
int
smp_core99_cpu_notify
(
struct
notifier_block
*
self
,
unsigned
long
action
,
void
*
hcpu
)
unsigned
long
action
,
void
*
hcpu
)
...
@@ -879,7 +880,6 @@ static struct notifier_block __cpuinitdata smp_core99_cpu_nb = {
...
@@ -879,7 +880,6 @@ static struct notifier_block __cpuinitdata smp_core99_cpu_nb = {
static
void
__init
smp_core99_bringup_done
(
void
)
static
void
__init
smp_core99_bringup_done
(
void
)
{
{
#ifdef CONFIG_PPC64
extern
void
g5_phy_disable_cpu1
(
void
);
extern
void
g5_phy_disable_cpu1
(
void
);
/* Close i2c bus if it was used for tb sync */
/* Close i2c bus if it was used for tb sync */
...
@@ -894,14 +894,14 @@ static void __init smp_core99_bringup_done(void)
...
@@ -894,14 +894,14 @@ static void __init smp_core99_bringup_done(void)
set_cpu_present
(
1
,
false
);
set_cpu_present
(
1
,
false
);
g5_phy_disable_cpu1
();
g5_phy_disable_cpu1
();
}
}
#endif
/* CONFIG_PPC64 */
#ifdef CONFIG_HOTPLUG_CPU
#ifdef CONFIG_HOTPLUG_CPU
register_cpu_notifier
(
&
smp_core99_cpu_nb
);
register_cpu_notifier
(
&
smp_core99_cpu_nb
);
#endif
#endif
if
(
ppc_md
.
progress
)
if
(
ppc_md
.
progress
)
ppc_md
.
progress
(
"smp_core99_bringup_done"
,
0x349
);
ppc_md
.
progress
(
"smp_core99_bringup_done"
,
0x349
);
}
}
#endif
/* CONFIG_PPC64 */
#ifdef CONFIG_HOTPLUG_CPU
#ifdef CONFIG_HOTPLUG_CPU
...
@@ -975,7 +975,9 @@ static void pmac_cpu_die(void)
...
@@ -975,7 +975,9 @@ static void pmac_cpu_die(void)
struct
smp_ops_t
core99_smp_ops
=
{
struct
smp_ops_t
core99_smp_ops
=
{
.
message_pass
=
smp_mpic_message_pass
,
.
message_pass
=
smp_mpic_message_pass
,
.
probe
=
smp_core99_probe
,
.
probe
=
smp_core99_probe
,
#ifdef CONFIG_PPC64
.
bringup_done
=
smp_core99_bringup_done
,
.
bringup_done
=
smp_core99_bringup_done
,
#endif
.
kick_cpu
=
smp_core99_kick_cpu
,
.
kick_cpu
=
smp_core99_kick_cpu
,
.
setup_cpu
=
smp_core99_setup_cpu
,
.
setup_cpu
=
smp_core99_setup_cpu
,
.
give_timebase
=
smp_core99_give_timebase
,
.
give_timebase
=
smp_core99_give_timebase
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment