[patch] correctly report NR_BANKS in mce_64.c

[patch] correctly report NR_BANKS in mce_64.c

[Pavel Machek]

From: Daniel Rahn <Daniel.Rahn@novell.com>

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>


diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c
index e07e8c0..2fb868e 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_64.c
@@ -445,8 +445,8 @@ static void mce_init(void *dummy)
 	rdmsrl(MSR_IA32_MCG_CAP, cap);
 	banks = cap & 0xff;
 	if (banks > NR_BANKS) {
-		printk(KERN_INFO "MCE: warning: using only %d banks\n", banks);
 		banks = NR_BANKS;
+		printk(KERN_INFO "MCE: warning: using only %d banks\n", banks);
 	}
 	/* Use accurate RIP reporting if available. */
 	if ((cap & (1<<9)) && ((cap >> 16) & 0xff) >= 9)

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: [patch] correctly report NR_BANKS in mce_64.c

[Ingo Molnar]

* Pavel Machek <pavel@suse.cz> wrote:

> From: Daniel Rahn <Daniel.Rahn@novell.com>
> 
> 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>

applied to tip/x86/mce, thanks Pavel.

[ There was a recent crossing commit that made your patch not apply 
  cleanly (8edc5cc5ec8 from May 12), i fixed up the impact manually. ]

	Ingo