diff options
Diffstat (limited to 'arch/x86/kernel/nmi.c')
-rw-r--r-- | arch/x86/kernel/nmi.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c index 47acaf319165..7b3fdfdabf94 100644 --- a/arch/x86/kernel/nmi.c +++ b/arch/x86/kernel/nmi.c | |||
@@ -19,8 +19,6 @@ | |||
19 | #include <linux/slab.h> | 19 | #include <linux/slab.h> |
20 | #include <linux/export.h> | 20 | #include <linux/export.h> |
21 | 21 | ||
22 | #include <linux/mca.h> | ||
23 | |||
24 | #if defined(CONFIG_EDAC) | 22 | #if defined(CONFIG_EDAC) |
25 | #include <linux/edac.h> | 23 | #include <linux/edac.h> |
26 | #endif | 24 | #endif |
@@ -282,16 +280,6 @@ unknown_nmi_error(unsigned char reason, struct pt_regs *regs) | |||
282 | 280 | ||
283 | __this_cpu_add(nmi_stats.unknown, 1); | 281 | __this_cpu_add(nmi_stats.unknown, 1); |
284 | 282 | ||
285 | #ifdef CONFIG_MCA | ||
286 | /* | ||
287 | * Might actually be able to figure out what the guilty party | ||
288 | * is: | ||
289 | */ | ||
290 | if (MCA_bus) { | ||
291 | mca_handle_nmi(); | ||
292 | return; | ||
293 | } | ||
294 | #endif | ||
295 | pr_emerg("Uhhuh. NMI received for unknown reason %02x on CPU %d.\n", | 283 | pr_emerg("Uhhuh. NMI received for unknown reason %02x on CPU %d.\n", |
296 | reason, smp_processor_id()); | 284 | reason, smp_processor_id()); |
297 | 285 | ||