Commit a345934d authored by Anton Blanchard's avatar Anton Blanchard Committed by Linus Torvalds

[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: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e6e51fde
......@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment