Merge tag 'jg-20061012-00' of git://electric-eye.fr.zoreil.com/home/romieu/linux...

[linux-2.6] / arch / ppc / kernel / smp.c

diff --git a/arch/ppc/kernel/smp.c b/arch/ppc/kernel/smp.c
index f77795a64daed9628c50b5885831377954c8006e..96a55972b986bd7103270ceeabd037e21edbb4bb 100644 (file)
--- a/arch/ppc/kernel/smp.c
+++ b/arch/ppc/kernel/smp.c
@@ -8,7 +8,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/sched.h>
@@ -85,7 +84,7 @@ smp_message_pass(int target, int msg)
 /*
  * Common functions
  */
-void smp_message_recv(int msg, struct pt_regs *regs)
+void smp_message_recv(int msg)
 {
        atomic_inc(&ipi_recv);
 
@@ -101,7 +100,7 @@ void smp_message_recv(int msg, struct pt_regs *regs)
                break;
 #ifdef CONFIG_XMON
        case PPC_MSG_XMON_BREAK:
-               xmon(regs);
+               xmon(get_irq_regs());
                break;
 #endif /* CONFIG_XMON */
        default: