lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'ras_queue_for_3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/mce

Browse Source 
Pull MCE changes from Borislav Petkov:

 " Patch 1/2 which enables MCA by default because I still see bugreports
   where CONFIG_X86_MCE is disabled and this is a bad idea so turning it on
   by default makes sense to me. The second one is a trivial cleanup. "

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
2012-09-19 17:01:50 +02:00
parent f1f6524476 57639bedd2
commit 961ebea4ae
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/Kconfig
View File

@@ -871,6 +871,7 @@ config X86_REROUTE_FOR_BROKEN_BOOT_IRQS
config X86_MCE config X86_MCE
bool "Machine Check / overheating reporting" bool "Machine Check / overheating reporting"
default y
---help--- ---help---
Machine Check support allows the processor to notify the Machine Check support allows the processor to notify the
kernel if it detects a problem (e.g. overheating, data corruption). kernel if it detects a problem (e.g. overheating, data corruption).

12
arch/x86/include/asm/mce.h
View File

@@ -116,19 +116,9 @@ struct mce_log {
/* Software defined banks */ /* Software defined banks */
#define MCE_EXTENDED_BANK 128 #define MCE_EXTENDED_BANK 128
#define MCE_THERMAL_BANK MCE_EXTENDED_BANK + 0 #define MCE_THERMAL_BANK MCE_EXTENDED_BANK + 0
#define K8_MCE_THRESHOLD_BASE (MCE_EXTENDED_BANK + 1)
#define K8_MCE_THRESHOLD_BASE (MCE_EXTENDED_BANK + 1) /* MCE_AMD */
#define K8_MCE_THRESHOLD_BANK_0 (MCE_THRESHOLD_BASE + 0 * 9)
#define K8_MCE_THRESHOLD_BANK_1 (MCE_THRESHOLD_BASE + 1 * 9)
#define K8_MCE_THRESHOLD_BANK_2 (MCE_THRESHOLD_BASE + 2 * 9)
#define K8_MCE_THRESHOLD_BANK_3 (MCE_THRESHOLD_BASE + 3 * 9)
#define K8_MCE_THRESHOLD_BANK_4 (MCE_THRESHOLD_BASE + 4 * 9)
#define K8_MCE_THRESHOLD_BANK_5 (MCE_THRESHOLD_BASE + 5 * 9)
#define K8_MCE_THRESHOLD_DRAM_ECC (MCE_THRESHOLD_BANK_4 + 0)
#ifdef __KERNEL__ #ifdef __KERNEL__
extern void mce_register_decode_chain(struct notifier_block *nb); extern void mce_register_decode_chain(struct notifier_block *nb);
extern void mce_unregister_decode_chain(struct notifier_block *nb); extern void mce_unregister_decode_chain(struct notifier_block *nb);