aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/cpu/mcheck/mce.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index cfb16f631d52..d2c611699cd9 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -292,10 +292,10 @@ static void print_mce(struct mce *m)
292 292
293#define PANIC_TIMEOUT 5 /* 5 seconds */ 293#define PANIC_TIMEOUT 5 /* 5 seconds */
294 294
295static atomic_t mce_paniced; 295static atomic_t mce_panicked;
296 296
297static int fake_panic; 297static int fake_panic;
298static atomic_t mce_fake_paniced; 298static atomic_t mce_fake_panicked;
299 299
300/* Panic in progress. Enable interrupts and wait for final IPI */ 300/* Panic in progress. Enable interrupts and wait for final IPI */
301static void wait_for_panic(void) 301static void wait_for_panic(void)
@@ -319,7 +319,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
319 /* 319 /*
320 * Make sure only one CPU runs in machine check panic 320 * Make sure only one CPU runs in machine check panic
321 */ 321 */
322 if (atomic_inc_return(&mce_paniced) > 1) 322 if (atomic_inc_return(&mce_panicked) > 1)
323 wait_for_panic(); 323 wait_for_panic();
324 barrier(); 324 barrier();
325 325
@@ -327,7 +327,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
327 console_verbose(); 327 console_verbose();
328 } else { 328 } else {
329 /* Don't log too much for fake panic */ 329 /* Don't log too much for fake panic */
330 if (atomic_inc_return(&mce_fake_paniced) > 1) 330 if (atomic_inc_return(&mce_fake_panicked) > 1)
331 return; 331 return;
332 } 332 }
333 /* First print corrected ones that are still unlogged */ 333 /* First print corrected ones that are still unlogged */
@@ -744,7 +744,7 @@ static int mce_timed_out(u64 *t)
744 * might have been modified by someone else. 744 * might have been modified by someone else.
745 */ 745 */
746 rmb(); 746 rmb();
747 if (atomic_read(&mce_paniced)) 747 if (atomic_read(&mce_panicked))
748 wait_for_panic(); 748 wait_for_panic();
749 if (!mca_cfg.monarch_timeout) 749 if (!mca_cfg.monarch_timeout)
750 goto out; 750 goto out;
@@ -2568,7 +2568,7 @@ struct dentry *mce_get_debugfs_dir(void)
2568static void mce_reset(void) 2568static void mce_reset(void)
2569{ 2569{
2570 cpu_missing = 0; 2570 cpu_missing = 0;
2571 atomic_set(&mce_fake_paniced, 0); 2571 atomic_set(&mce_fake_panicked, 0);
2572 atomic_set(&mce_executing, 0); 2572 atomic_set(&mce_executing, 0);
2573 atomic_set(&mce_callin, 0); 2573 atomic_set(&mce_callin, 0);
2574 atomic_set(&global_nwo, 0); 2574 atomic_set(&global_nwo, 0);