diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2008-11-12 08:34:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-12 12:55:45 -0500 |
| commit | d1e7b91cfaa8fc5ed736dcfb8beb5134a2385228 (patch) | |
| tree | 0a892372acedc89821499bfcb1a7eeda15fc125d | |
| parent | b2bbe71b829564fb65a6bc7e1e25e02d70cffce8 (diff) | |
x86 kdump: create kdump_nmi_shootdown_cpus()
Impact: cleanup
For the kdump-specific code that was living on nmi_shootdown_cpus().
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/kernel/crash.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index ed2f0f9dc894..75c468cc7e59 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c | |||
| @@ -122,10 +122,17 @@ static void nmi_shootdown_cpus(void) | |||
| 122 | } | 122 | } |
| 123 | 123 | ||
| 124 | /* Leave the nmi callback set */ | 124 | /* Leave the nmi callback set */ |
| 125 | } | ||
| 126 | |||
| 127 | static void kdump_nmi_shootdown_cpus(void) | ||
| 128 | { | ||
| 129 | nmi_shootdown_cpus(); | ||
| 130 | |||
| 125 | disable_local_APIC(); | 131 | disable_local_APIC(); |
| 126 | } | 132 | } |
| 133 | |||
| 127 | #else | 134 | #else |
| 128 | static void nmi_shootdown_cpus(void) | 135 | static void kdump_nmi_shootdown_cpus(void) |
| 129 | { | 136 | { |
| 130 | /* There are no cpus to shootdown */ | 137 | /* There are no cpus to shootdown */ |
| 131 | } | 138 | } |
| @@ -144,7 +151,7 @@ void native_machine_crash_shutdown(struct pt_regs *regs) | |||
| 144 | /* The kernel is broken so disable interrupts */ | 151 | /* The kernel is broken so disable interrupts */ |
| 145 | local_irq_disable(); | 152 | local_irq_disable(); |
| 146 | 153 | ||
| 147 | nmi_shootdown_cpus(); | 154 | kdump_nmi_shootdown_cpus(); |
| 148 | lapic_shutdown(); | 155 | lapic_shutdown(); |
| 149 | #if defined(CONFIG_X86_IO_APIC) | 156 | #if defined(CONFIG_X86_IO_APIC) |
| 150 | disable_IO_APIC(); | 157 | disable_IO_APIC(); |
