[PATCH] ppc64: fix hotplug CPU when building a pseries+pmac kernel

When a pseries+pmac kernel is built, the rtas stop-self token wasnt being
initialised.  Since doing this will safely fail on pmac, remove the
!CONFIG_PPC_PMAC restriction

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/ppc64/kernel/setup.c b/arch/ppc64/kernel/setup.c
index 6e2171ea02de6ca2a8ff4a561dc1b948dbf0c821..672a19ee9904808924446d393b1176ed5730c423 100644 (file)
--- a/arch/ppc64/kernel/setup.c
+++ b/arch/ppc64/kernel/setup.c
@@ -427,9 +427,9 @@ void setup_system(unsigned long r3, unsigned long r4, unsigned long r5,
 #endif /* CONFIG_PPC_PSERIES */
 #endif /* CONFIG_SMP */
 
-#if defined(CONFIG_HOTPLUG_CPU) &&  !defined(CONFIG_PPC_PMAC)
+#if defined(CONFIG_HOTPLUG_CPU)
        rtas_stop_self_args.token = rtas_token("stop-self");
-#endif /* CONFIG_HOTPLUG_CPU && !CONFIG_PPC_PMAC */
+#endif /* CONFIG_HOTPLUG_CPU */
 
        /* Finish initializing the hash table (do the dynamic
         * patching for the fast-path hashtable.S code)