summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Rahn <Daniel.Rahn@novell.com>2008-06-06 09:42:36 +0200
committerIngo Molnar <mingo@elte.hu>2008-06-18 10:29:58 +0200
commitb4b3bd96f26586e53ab5482f1869221dd1b5ac36 (patch)
treed8e9bb89aa5c78e48d84d3ed1222b1d7dd1d4bc4
parent8edc5cc5ec880c96de8e6686fb0d7a5231e91c05 (diff)
x86: correctly report NR_BANKS in mce_64.c
attached is a no-brainer that makes kernel correctly report NR_BANKS for MCE. We are right now limited to NR_BANKS==6, but the error message will use the available number of banks instead of the defined maximum. For a Nehalem based system it will print: "MCE: warning: using only 9 banks" while the correct message would be "MCE: warning: using only 6 banks" Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/cpu/mcheck/mce_64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c
index f1f3f5e163b..8c8299ce7ad 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_64.c
@@ -445,9 +445,9 @@ static void mce_init(void *dummy)
rdmsrl(MSR_IA32_MCG_CAP, cap);
banks = cap & 0xff;
if (banks > MCE_EXTENDED_BANK) {
+ banks = MCE_EXTENDED_BANK;
printk(KERN_INFO "MCE: warning: using only %d banks\n",
MCE_EXTENDED_BANK);
- banks = MCE_EXTENDED_BANK;
}
/* Use accurate RIP reporting if available. */
if ((cap & (1<<9)) && ((cap >> 16) & 0xff) >= 9)