ftrace: return error on failed modified text.

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

diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
index 575aa3d..18f9b19 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();
@@ -214,12 +214,16 @@ void smp_call_function_single_interrupt(void)
 struct smp_ops smp_ops = {
        .smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,
        .smp_prepare_cpus = native_smp_prepare_cpus,
-       .cpu_up = native_cpu_up,
        .smp_cpus_done = native_smp_cpus_done,
 
        .smp_send_stop = native_smp_send_stop,
        .smp_send_reschedule = native_smp_send_reschedule,
 
+       .cpu_up = native_cpu_up,
+       .cpu_die = native_cpu_die,
+       .cpu_disable = native_cpu_disable,
+       .play_dead = native_play_dead,
+
        .send_call_func_ipi = native_send_call_func_ipi,
        .send_call_func_single_ipi = native_send_call_func_single_ipi,
 };