diff options
-rw-r--r-- | arch/x86/include/asm/mce.h | 2 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce.c | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h index 6e4ce2df87cf..958b90f761e5 100644 --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h | |||
@@ -176,8 +176,6 @@ int mce_available(struct cpuinfo_x86 *c); | |||
176 | DECLARE_PER_CPU(unsigned, mce_exception_count); | 176 | DECLARE_PER_CPU(unsigned, mce_exception_count); |
177 | DECLARE_PER_CPU(unsigned, mce_poll_count); | 177 | DECLARE_PER_CPU(unsigned, mce_poll_count); |
178 | 178 | ||
179 | extern atomic_t mce_entry; | ||
180 | |||
181 | typedef DECLARE_BITMAP(mce_banks_t, MAX_NR_BANKS); | 179 | typedef DECLARE_BITMAP(mce_banks_t, MAX_NR_BANKS); |
182 | DECLARE_PER_CPU(mce_banks_t, mce_poll_banks); | 180 | DECLARE_PER_CPU(mce_banks_t, mce_poll_banks); |
183 | 181 | ||
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 6cc800381d14..bb92f38153b2 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c | |||
@@ -60,8 +60,6 @@ static DEFINE_MUTEX(mce_chrdev_read_mutex); | |||
60 | 60 | ||
61 | #define SPINUNIT 100 /* 100ns */ | 61 | #define SPINUNIT 100 /* 100ns */ |
62 | 62 | ||
63 | atomic_t mce_entry; | ||
64 | |||
65 | DEFINE_PER_CPU(unsigned, mce_exception_count); | 63 | DEFINE_PER_CPU(unsigned, mce_exception_count); |
66 | 64 | ||
67 | struct mce_bank *mce_banks __read_mostly; | 65 | struct mce_bank *mce_banks __read_mostly; |
@@ -1040,8 +1038,6 @@ void do_machine_check(struct pt_regs *regs, long error_code) | |||
1040 | DECLARE_BITMAP(valid_banks, MAX_NR_BANKS); | 1038 | DECLARE_BITMAP(valid_banks, MAX_NR_BANKS); |
1041 | char *msg = "Unknown"; | 1039 | char *msg = "Unknown"; |
1042 | 1040 | ||
1043 | atomic_inc(&mce_entry); | ||
1044 | |||
1045 | this_cpu_inc(mce_exception_count); | 1041 | this_cpu_inc(mce_exception_count); |
1046 | 1042 | ||
1047 | if (!cfg->banks) | 1043 | if (!cfg->banks) |
@@ -1171,7 +1167,6 @@ void do_machine_check(struct pt_regs *regs, long error_code) | |||
1171 | mce_report_event(regs); | 1167 | mce_report_event(regs); |
1172 | mce_wrmsrl(MSR_IA32_MCG_STATUS, 0); | 1168 | mce_wrmsrl(MSR_IA32_MCG_STATUS, 0); |
1173 | out: | 1169 | out: |
1174 | atomic_dec(&mce_entry); | ||
1175 | sync_core(); | 1170 | sync_core(); |
1176 | } | 1171 | } |
1177 | EXPORT_SYMBOL_GPL(do_machine_check); | 1172 | EXPORT_SYMBOL_GPL(do_machine_check); |