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/kernel/rtas.c | |
| 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/kernel/rtas.c')
| -rw-r--r-- | arch/powerpc/kernel/rtas.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index 6ef80d4e38d3..387ed0d9ad61 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/arch/powerpc/kernel/rtas.c @@ -810,9 +810,9 @@ asmlinkage int ppc_rtas(struct rtas_args __user *uargs) return 0; } +#ifdef CONFIG_HOTPLUG_CPU /* This version can't take the spinlock, because it never returns */ - -struct rtas_args rtas_stop_self_args = { +static struct rtas_args rtas_stop_self_args = { /* The token is initialized for real in setup_system() */ .token = RTAS_UNKNOWN_SERVICE, .nargs = 0, @@ -834,6 +834,7 @@ void rtas_stop_self(void) panic("Alas, I survived.\n"); } +#endif /* * Call early during boot, before mem init or bootmem, to retrieve the RTAS |