Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 166494
b: refs/heads/master
c: e207e14
h: refs/heads/master
v: v3
  • Loading branch information
Linus Torvalds committed Sep 30, 2009
1 parent dbebbc2 commit 392a46f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 17d857be649a21ca90008c6dc425d849fa83db5c
refs/heads/master: e207e143e2fb6a2790b1ce3687c8aedc3ddc357b
5 changes: 1 addition & 4 deletions trunk/arch/x86/kernel/cpu/mcheck/mce.c
Original file line number Diff line number Diff line change
Expand Up @@ -204,10 +204,7 @@ static void print_mce_head(void)
static void print_mce_tail(void)
{
printk(KERN_EMERG "This is not a software problem!\n"
#if (!defined(CONFIG_EDAC) || !defined(CONFIG_CPU_SUP_AMD))
"Run through mcelog --ascii to decode and contact your hardware vendor\n"
#endif
);
"Run through mcelog --ascii to decode and contact your hardware vendor\n");
}

#define PANIC_TIMEOUT 5 /* 5 seconds */
Expand Down

0 comments on commit 392a46f

Please sign in to comment.