diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 16:24:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 16:24:51 -0700 |
| commit | e8779776afbd5f2d5315cf48c4257ca7e9b250fb (patch) | |
| tree | a439733c6c71dd7d24ba65557159c30c2e49861a /include/linux | |
| parent | 3cf8ad3394b8675e92a35c438f22341197535531 (diff) | |
| parent | a2d7b0d4852536273b65d16fe179c65184fe5e2d (diff) | |
Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, mce: Use HW_ERR in MCE handler
x86, mce: Add HW_ERR printk prefix for hardware error logging
x86, mce: Fix MSR_IA32_MCI_CTL2 CMCI threshold setup
x86, mce: Rename MSR_IA32_MCx_CTL2 value
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/kernel.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 38e462e0059..7d5b10ff63e 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -252,6 +252,13 @@ extern struct pid *session_of_pgrp(struct pid *pgrp); #define FW_WARN "[Firmware Warn]: " #define FW_INFO "[Firmware Info]: " +/* + * HW_ERR + * Add this to a message for hardware errors, so that user can report + * it to hardware vendor instead of LKML or software vendor. + */ +#define HW_ERR "[Hardware Error]: " + #ifdef CONFIG_PRINTK asmlinkage int vprintk(const char *fmt, va_list args) __attribute__ ((format (printf, 1, 0))); |