diff options
Diffstat (limited to 'arch/x86/kernel/cpu/mcheck/mce.c')
-rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 49c74222359..14733362741 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c | |||
@@ -569,7 +569,8 @@ static int mce_cap_init(void) | |||
569 | u64 cap; | 569 | u64 cap; |
570 | 570 | ||
571 | rdmsrl(MSR_IA32_MCG_CAP, cap); | 571 | rdmsrl(MSR_IA32_MCG_CAP, cap); |
572 | b = cap & 0xff; | 572 | |
573 | b = cap & MCG_BANKCNT_MASK; | ||
573 | printk(KERN_INFO "mce: CPU supports %d MCE banks\n", b); | 574 | printk(KERN_INFO "mce: CPU supports %d MCE banks\n", b); |
574 | 575 | ||
575 | if (b > MAX_NR_BANKS) { | 576 | if (b > MAX_NR_BANKS) { |
@@ -590,7 +591,7 @@ static int mce_cap_init(void) | |||
590 | } | 591 | } |
591 | 592 | ||
592 | /* Use accurate RIP reporting if available. */ | 593 | /* Use accurate RIP reporting if available. */ |
593 | if ((cap & (1<<9)) && ((cap >> 16) & 0xff) >= 9) | 594 | if ((cap & MCG_EXT_P) && MCG_EXT_CNT(cap) >= 9) |
594 | rip_msr = MSR_IA32_MCG_EIP; | 595 | rip_msr = MSR_IA32_MCG_EIP; |
595 | 596 | ||
596 | return 0; | 597 | return 0; |