aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/cpu/mcheck/mce_32.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce_32.c b/arch/x86/kernel/cpu/mcheck/mce_32.c
index 3552119b091d..05979e7eff12 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_32.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_32.c
@@ -2,13 +2,12 @@
2 * mce.c - x86 Machine Check Exception Reporting 2 * mce.c - x86 Machine Check Exception Reporting
3 * (c) 2002 Alan Cox <alan@lxorguk.ukuu.org.uk>, Dave Jones <davej@redhat.com> 3 * (c) 2002 Alan Cox <alan@lxorguk.ukuu.org.uk>, Dave Jones <davej@redhat.com>
4 */ 4 */
5 5#include <linux/thread_info.h>
6#include <linux/init.h>
7#include <linux/types.h>
8#include <linux/kernel.h> 6#include <linux/kernel.h>
9#include <linux/module.h> 7#include <linux/module.h>
8#include <linux/types.h>
9#include <linux/init.h>
10#include <linux/smp.h> 10#include <linux/smp.h>
11#include <linux/thread_info.h>
12 11
13#include <asm/processor.h> 12#include <asm/processor.h>
14#include <asm/system.h> 13#include <asm/system.h>
@@ -17,18 +16,20 @@
17#include "mce.h" 16#include "mce.h"
18 17
19int mce_disabled; 18int mce_disabled;
20int nr_mce_banks;
21 19
20int nr_mce_banks;
22EXPORT_SYMBOL_GPL(nr_mce_banks); /* non-fatal.o */ 21EXPORT_SYMBOL_GPL(nr_mce_banks); /* non-fatal.o */
23 22
24/* Handle unconfigured int18 (should never happen) */ 23/* Handle unconfigured int18 (should never happen) */
25static void unexpected_machine_check(struct pt_regs *regs, long error_code) 24static void unexpected_machine_check(struct pt_regs *regs, long error_code)
26{ 25{
27 printk(KERN_ERR "CPU#%d: Unexpected int18 (Machine Check).\n", smp_processor_id()); 26 printk(KERN_ERR "CPU#%d: Unexpected int18 (Machine Check).\n",
27 smp_processor_id());
28} 28}
29 29
30/* Call the installed machine check handler for this CPU setup. */ 30/* Call the installed machine check handler for this CPU setup. */
31void (*machine_check_vector)(struct pt_regs *, long error_code) = unexpected_machine_check; 31void (*machine_check_vector)(struct pt_regs *, long error_code) =
32 unexpected_machine_check;
32 33
33/* This has to be run for each processor */ 34/* This has to be run for each processor */
34void mcheck_init(struct cpuinfo_x86 *c) 35void mcheck_init(struct cpuinfo_x86 *c)