[PATCH] 64bit resource: fix up printks for resources in arch and core code

[powerpc.git] / arch / powerpc / platforms / chrp / smp.c

diff --git a/arch/powerpc/platforms/chrp/smp.c b/arch/powerpc/platforms/chrp/smp.c
index bf68282..b616053 100644 (file)
--- a/arch/powerpc/platforms/chrp/smp.c
+++ b/arch/powerpc/platforms/chrp/smp.c
@@ -32,16 +32,9 @@
 #include <asm/time.h>
 #include <asm/open_pic.h>
 #include <asm/machdep.h>
-
-extern unsigned long smp_chrp_cpu_nr;
-
-static int __init smp_chrp_probe(void)
-{
-       if (smp_chrp_cpu_nr > 1)
-               openpic_request_IPIs();
-
-       return smp_chrp_cpu_nr;
-}
+#include <asm/smp.h>
+#include <asm/mpic.h>
+#include <asm/rtas.h>
 
 static void __devinit smp_chrp_kick_cpu(int nr)
 {
@@ -51,8 +44,7 @@ static void __devinit smp_chrp_kick_cpu(int nr)
 
 static void __devinit smp_chrp_setup_cpu(int cpu_nr)
 {
-       if (OpenPIC_Addr)
-               do_openpic_setup_cpu();
+       mpic_setup_this_cpu();
 }
 
 static DEFINE_SPINLOCK(timebase_lock);
@@ -85,8 +77,8 @@ void __devinit smp_chrp_take_timebase(void)
 
 /* CHRP with openpic */
 struct smp_ops_t chrp_smp_ops = {
-       .message_pass = smp_openpic_message_pass,
-       .probe = smp_chrp_probe,
+       .message_pass = smp_mpic_message_pass,
+       .probe = smp_mpic_probe,
        .kick_cpu = smp_chrp_kick_cpu,
        .setup_cpu = smp_chrp_setup_cpu,
        .give_timebase = smp_chrp_give_timebase,