Merge branch 'linus' into x86/urgent

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

diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
index 575aa3d7248ad2d6949d296c3e2fc5d922c85dfe..361b7a4c640c2d9efaee2d95f860bc83d985a2a5 100644 (file)
--- a/arch/x86/kernel/smp.c
+++ b/arch/x86/kernel/smp.c
@@ -164,7 +164,7 @@ static void native_smp_send_stop(void)
        if (reboot_force)
                return;
 
-       smp_call_function(stop_this_cpu, NULL, 0, 0);
+       smp_call_function(stop_this_cpu, NULL, 0);
        local_irq_save(flags);
        disable_local_APIC();
        local_irq_restore(flags);
@@ -198,7 +198,7 @@ void smp_call_function_interrupt(struct pt_regs *regs)
        irq_exit();
 }
 
-void smp_call_function_single_interrupt(void)
+void smp_call_function_single_interrupt(struct pt_regs *regs)
 {
        ack_APIC_irq();
        irq_enter();