[PATCH] ppc64: fix smp_startup_cpu for cpu hotplug

This change is needed in order to allow cpus to be onlined after
boot.  This used to work but the declaration of
pseries_secondary_smp_init in this file was changed in Ben's big
cleanup patch a while back, so the cpu would start at a bad address.

Signed-off-by: Nathan Lynch <nathanl@austin.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/ppc64/kernel/smp.c b/arch/ppc64/kernel/smp.c
index 923c0ff0102ec8b851fcb7f43e50b80d6e54c449..75ced752807e008bf009350e261324fcc800d9db 100644 (file)
--- a/arch/ppc64/kernel/smp.c
+++ b/arch/ppc64/kernel/smp.c
@@ -390,7 +390,8 @@ out:
 static inline int __devinit smp_startup_cpu(unsigned int lcpu)
 {
        int status;
-       unsigned long start_here = __pa(pseries_secondary_smp_init);
+       unsigned long start_here = __pa((u32)*((unsigned long *)
+                                              pseries_secondary_smp_init));
        unsigned int pcpu;
 
        /* At boot time the cpus are already spinning in hold