p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

x86/mce: Spell "panicked" correctly 

We need the additional "k" to make it a hard-c:

  https://en.wiktionary.org/wiki/panicked

Signed-off-by: Borislav Petkov <bp@suse.de>
Link: http://lkml.kernel.org/r/1417642605-15730-1-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Borislav Petkov 2014-12-03 22:36:45 +01:00 committed by Ingo Molnar
parent b9e6df0a2d
commit c7c9b3929b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/x86/kernel/cpu/mcheck/mce.c
View File

@ -292,10 +292,10 @@ static void print_mce(struct mce *m)
#define PANIC_TIMEOUT 5 /* 5 seconds */ #define PANIC_TIMEOUT 5 /* 5 seconds */
static atomic_t mce_paniced; static atomic_t mce_panicked;
static int fake_panic; static int fake_panic;
static atomic_t mce_fake_paniced; static atomic_t mce_fake_panicked;
/* Panic in progress. Enable interrupts and wait for final IPI */ /* Panic in progress. Enable interrupts and wait for final IPI */
static void wait_for_panic(void) static void wait_for_panic(void)
@ -319,7 +319,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
/* /*
* Make sure only one CPU runs in machine check panic * Make sure only one CPU runs in machine check panic
*/ */
if (atomic_inc_return(&mce_paniced) > 1) if (atomic_inc_return(&mce_panicked) > 1)
wait_for_panic(); wait_for_panic();
barrier(); barrier();
@ -327,7 +327,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
console_verbose(); console_verbose();
} else { } else {
/* Don't log too much for fake panic */ /* Don't log too much for fake panic */
if (atomic_inc_return(&mce_fake_paniced) > 1) if (atomic_inc_return(&mce_fake_panicked) > 1)
return; return;
} }
/* First print corrected ones that are still unlogged */ /* First print corrected ones that are still unlogged */
@ -744,7 +744,7 @@ static int mce_timed_out(u64 *t)
* might have been modified by someone else. * might have been modified by someone else.
*/ */
rmb(); rmb();
if (atomic_read(&mce_paniced)) if (atomic_read(&mce_panicked))
wait_for_panic(); wait_for_panic();
if (!mca_cfg.monarch_timeout) if (!mca_cfg.monarch_timeout)
goto out; goto out;
@ -2568,7 +2568,7 @@ struct dentry *mce_get_debugfs_dir(void)
static void mce_reset(void) static void mce_reset(void)
{ {
cpu_missing = 0; cpu_missing = 0;
atomic_set(&mce_fake_paniced, 0); atomic_set(&mce_fake_panicked, 0);
atomic_set(&mce_executing, 0); atomic_set(&mce_executing, 0);
atomic_set(&mce_callin, 0); atomic_set(&mce_callin, 0);
atomic_set(&global_nwo, 0); atomic_set(&global_nwo, 0);