diff options
| -rw-r--r-- | arch/x86/include/asm/reboot.h | 5 | ||||
| -rw-r--r-- | arch/x86/kernel/crash.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h index df7710354f85..562d4fd31ba8 100644 --- a/arch/x86/include/asm/reboot.h +++ b/arch/x86/include/asm/reboot.h | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | #ifndef _ASM_X86_REBOOT_H | 1 | #ifndef _ASM_X86_REBOOT_H |
| 2 | #define _ASM_X86_REBOOT_H | 2 | #define _ASM_X86_REBOOT_H |
| 3 | 3 | ||
| 4 | #include <linux/kdebug.h> | ||
| 5 | |||
| 4 | struct pt_regs; | 6 | struct pt_regs; |
| 5 | 7 | ||
| 6 | struct machine_ops { | 8 | struct machine_ops { |
| @@ -18,4 +20,7 @@ void native_machine_crash_shutdown(struct pt_regs *regs); | |||
| 18 | void native_machine_shutdown(void); | 20 | void native_machine_shutdown(void); |
| 19 | void machine_real_restart(const unsigned char *code, int length); | 21 | void machine_real_restart(const unsigned char *code, int length); |
| 20 | 22 | ||
| 23 | typedef void (*nmi_shootdown_cb)(int, struct die_args*); | ||
| 24 | void nmi_shootdown_cpus(nmi_shootdown_cb callback); | ||
| 25 | |||
| 21 | #endif /* _ASM_X86_REBOOT_H */ | 26 | #endif /* _ASM_X86_REBOOT_H */ |
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index f23c2beeb37d..fb298d1daac9 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | 29 | ||
| 30 | #include <mach_ipi.h> | 30 | #include <mach_ipi.h> |
| 31 | 31 | ||
| 32 | typedef void (*nmi_shootdown_cb)(int, struct die_args*); | ||
| 33 | 32 | ||
| 34 | #if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC) | 33 | #if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC) |
| 35 | 34 | ||
| @@ -100,7 +99,7 @@ static struct notifier_block crash_nmi_nb = { | |||
| 100 | .notifier_call = crash_nmi_callback, | 99 | .notifier_call = crash_nmi_callback, |
| 101 | }; | 100 | }; |
| 102 | 101 | ||
| 103 | static void nmi_shootdown_cpus(nmi_shootdown_cb callback) | 102 | void nmi_shootdown_cpus(nmi_shootdown_cb callback) |
| 104 | { | 103 | { |
| 105 | unsigned long msecs; | 104 | unsigned long msecs; |
| 106 | 105 | ||
