From: Jeremy Kerr <jk@ozlabs.org>
Date: Wed, 12 Sep 2007 08:43:15 +0000 (+1000)
Subject: [POWERPC] PS3: Fix CONFIG_SMP=n, CONFIG_KEXEC=y build
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=85d02924a38789be35e83adba32eb6690535cfb0;p=deliverable%2Flinux.git

[POWERPC] PS3: Fix CONFIG_SMP=n, CONFIG_KEXEC=y build

Currently, the ps3 kernel fails to build without smp but with kexec, as
ps3_kexec_cpu_down needs ps3_smp_cleanup_cpu, which isn't defined on UP
kernels. This change adds an empty ps3_smp_cleanup_cpu for UP kernels.

Booted on ps3.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/arch/powerpc/platforms/ps3/platform.h b/arch/powerpc/platforms/ps3/platform.h
index 2eb8f92704b4..27c7d099816a 100644
--- a/arch/powerpc/platforms/ps3/platform.h
+++ b/arch/powerpc/platforms/ps3/platform.h
@@ -47,7 +47,11 @@ void __init ps3_register_ipi_debug_brk(unsigned int cpu, unsigned int virq);
 /* smp */
 
 void smp_init_ps3(void);
+#ifdef CONFIG_SMP
 void ps3_smp_cleanup_cpu(int cpu);
+#else
+static inline void ps3_smp_cleanup_cpu(int cpu) { }
+#endif
 
 /* time */