diff options
| author | Linas Vepstas <linas@austin.ibm.com> | 2006-11-16 15:41:15 -0600 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-04 20:39:29 +1100 |
| commit | 088df4d256227b3d927bb6ed57e66d138da0565c (patch) | |
| tree | aba5648874cff0c517c286c79414026edc5d9534 /arch/powerpc/platforms/pseries | |
| parent | 5873c9bdb05e9cc68ff4c45a192032a61f705067 (diff) | |
| download | linux-088df4d256227b3d927bb6ed57e66d138da0565c.tar.gz linux-088df4d256227b3d927bb6ed57e66d138da0565c.tar.bz2 linux-088df4d256227b3d927bb6ed57e66d138da0565c.zip | |
[POWERPC] Wrap cpu_die() with CONFIG_HOTPLUG_CPU
Per email discussion, it appears that rtas_stop_self()
and pSeries_mach_cpu_die() should not be compiled if
CONFIG_HOTPLUG_CPU is not defined. This patch adds
#ifdefs around these bits of code.
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/pseries')
| -rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index a8f3812aa38e..0dc2548ca9bc 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c @@ -347,6 +347,7 @@ static int __init pSeries_init_panel(void) } arch_initcall(pSeries_init_panel); +#ifdef CONFIG_HOTPLUG_CPU static void pSeries_mach_cpu_die(void) { local_irq_disable(); @@ -357,6 +358,9 @@ static void pSeries_mach_cpu_die(void) BUG(); for(;;); } +#else +#define pSeries_mach_cpu_die NULL +#endif static int pseries_set_dabr(unsigned long dabr) { |