diff options
| author | Borislav Petkov <bp@suse.de> | 2014-12-03 16:36:45 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-12-08 05:12:46 -0500 |
| commit | c7c9b3929b6a57ad47ab4021c77e46f7ff21c007 (patch) | |
| tree | 4dc4be14c769be1702f1af54f3d48c40a3bb6991 | |
| parent | b9e6df0a2dccdcd22090cdd140a1bfd8ae2e508b (diff) | |
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>
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce.c | 12 |
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 | ||
| 295 | static atomic_t mce_paniced; | 295 | static atomic_t mce_panicked; |
| 296 | 296 | ||
| 297 | static int fake_panic; | 297 | static int fake_panic; |
| 298 | static atomic_t mce_fake_paniced; | 298 | static 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 */ |
| 301 | static void wait_for_panic(void) | 301 | static 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) | |||
| 2568 | static void mce_reset(void) | 2568 | static 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); |
