Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[pandora-kernel.git] / arch / powerpc / platforms / ps3 / smp.c

diff --git a/arch/powerpc/platforms/ps3/smp.c b/arch/powerpc/platforms/ps3/smp.c
index 51ffde4..4c44794 100644 (file)
--- a/arch/powerpc/platforms/ps3/smp.c
+++ b/arch/powerpc/platforms/ps3/smp.c
@@ -39,7 +39,7 @@
 #define MSG_COUNT 4
 static DEFINE_PER_CPU(unsigned int [MSG_COUNT], ps3_ipi_virqs);
 
-static void do_message_pass(int target, int msg)
+static void ps3_smp_message_pass(int cpu, int msg)
 {
        int result;
        unsigned int virq;
@@ -49,28 +49,12 @@ static void do_message_pass(int target, int msg)
                return;
        }
 
-       virq = per_cpu(ps3_ipi_virqs, target)[msg];
+       virq = per_cpu(ps3_ipi_virqs, cpu)[msg];
        result = ps3_send_event_locally(virq);
 
        if (result)
                DBG("%s:%d: ps3_send_event_locally(%d, %d) failed"
-                       " (%d)\n", __func__, __LINE__, target, msg, result);
-}
-
-static void ps3_smp_message_pass(int target, int msg)
-{
-       int cpu;
-
-       if (target < NR_CPUS)
-               do_message_pass(target, msg);
-       else if (target == MSG_ALL_BUT_SELF) {
-               for_each_online_cpu(cpu)
-                       if (cpu != smp_processor_id())
-                               do_message_pass(cpu, msg);
-       } else {
-               for_each_online_cpu(cpu)
-                       do_message_pass(cpu, msg);
-       }
+                       " (%d)\n", __func__, __LINE__, cpu, msg, result);
 }
 
 static int ps3_smp_probe(void)