aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/cpu/mcheck/mce.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 739fd7eca0a4..2d2e0b565a9c 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -57,7 +57,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
57void (*machine_check_vector)(struct pt_regs *, long error_code) = 57void (*machine_check_vector)(struct pt_regs *, long error_code) =
58 unexpected_machine_check; 58 unexpected_machine_check;
59 59
60int mce_disabled; 60int mce_disabled __read_mostly;
61 61
62#ifdef CONFIG_X86_NEW_MCE 62#ifdef CONFIG_X86_NEW_MCE
63 63
@@ -76,19 +76,19 @@ DEFINE_PER_CPU(unsigned, mce_exception_count);
76 * 2: SIGBUS or log uncorrected errors (if possible), log corrected errors 76 * 2: SIGBUS or log uncorrected errors (if possible), log corrected errors
77 * 3: never panic or SIGBUS, log all errors (for testing only) 77 * 3: never panic or SIGBUS, log all errors (for testing only)
78 */ 78 */
79static int tolerant = 1; 79static int tolerant __read_mostly = 1;
80static int banks; 80static int banks __read_mostly;
81static u64 *bank; 81static u64 *bank __read_mostly;
82static unsigned long notify_user; 82static int rip_msr __read_mostly;
83static int rip_msr; 83static int mce_bootlog __read_mostly = -1;
84static int mce_bootlog = -1; 84static int monarch_timeout __read_mostly = -1;
85static int monarch_timeout = -1; 85static int mce_panic_timeout __read_mostly;
86static int mce_panic_timeout; 86static int mce_dont_log_ce __read_mostly;
87static int mce_dont_log_ce; 87int mce_cmci_disabled __read_mostly;
88int mce_cmci_disabled; 88int mce_ignore_ce __read_mostly;
89int mce_ignore_ce; 89int mce_ser __read_mostly;
90int mce_ser;
91 90
91static unsigned long notify_user;
92static char trigger[128]; 92static char trigger[128];
93static char *trigger_argv[2] = { trigger, NULL }; 93static char *trigger_argv[2] = { trigger, NULL };
94 94