aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/cpu/mcheck/mce.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 5ff6362ecb1..e16271f01ac 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -45,17 +45,6 @@
45 45
46#include "mce-internal.h" 46#include "mce-internal.h"
47 47
48/* Handle unconfigured int18 (should never happen) */
49static void unexpected_machine_check(struct pt_regs *regs, long error_code)
50{
51 printk(KERN_ERR "CPU#%d: Unexpected int18 (Machine Check).\n",
52 smp_processor_id());
53}
54
55/* Call the installed machine check handler for this CPU setup. */
56void (*machine_check_vector)(struct pt_regs *, long error_code) =
57 unexpected_machine_check;
58
59int mce_disabled __read_mostly; 48int mce_disabled __read_mostly;
60 49
61#define MISC_MCELOG_MINOR 227 50#define MISC_MCELOG_MINOR 227
@@ -1322,6 +1311,17 @@ static void mce_init_timer(void)
1322 add_timer(t); 1311 add_timer(t);
1323} 1312}
1324 1313
1314/* Handle unconfigured int18 (should never happen) */
1315static void unexpected_machine_check(struct pt_regs *regs, long error_code)
1316{
1317 printk(KERN_ERR "CPU#%d: Unexpected int18 (Machine Check).\n",
1318 smp_processor_id());
1319}
1320
1321/* Call the installed machine check handler for this CPU setup. */
1322void (*machine_check_vector)(struct pt_regs *, long error_code) =
1323 unexpected_machine_check;
1324
1325/* 1325/*
1326 * Called for each booted CPU to set up machine checks. 1326 * Called for each booted CPU to set up machine checks.
1327 * Must be called with preempt off: 1327 * Must be called with preempt off: