diff options
author | Venki Pallipadi <venkatesh.pallipadi@intel.com> | 2008-06-24 20:12:56 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-03 09:05:21 -0400 |
commit | 2d144e63098be47c21ad59d68a4fd17bd73a3aaf (patch) | |
tree | 8459b9f4d0ea0c985b93d810f8fc1befca1b4dff /arch/x86/kernel/cpu/mcheck | |
parent | a8cac817764a494705aebd99fd51bdf6cdc28ec9 (diff) |
x86, mce_64.c: mce_cpu_quirks being ignored
Quirks getting ignored was a bug. Below patch fixes the bug, until
we have the dynamic banks support.
Sysfs choice configuration should not have any issues with the earlier patch
as we look for NR_SYSFS_BANKS in do_machine_check().
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Max Asbock <masbock@us.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu/mcheck')
-rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce_64.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c index 8c8299ce7ad4..501ca1cea27d 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_64.c +++ b/arch/x86/kernel/cpu/mcheck/mce_64.c | |||
@@ -463,7 +463,11 @@ static void mce_init(void *dummy) | |||
463 | wrmsr(MSR_IA32_MCG_CTL, 0xffffffff, 0xffffffff); | 463 | wrmsr(MSR_IA32_MCG_CTL, 0xffffffff, 0xffffffff); |
464 | 464 | ||
465 | for (i = 0; i < banks; i++) { | 465 | for (i = 0; i < banks; i++) { |
466 | wrmsrl(MSR_IA32_MC0_CTL+4*i, ~0UL); | 466 | if (i < NR_SYSFS_BANKS) |
467 | wrmsrl(MSR_IA32_MC0_CTL+4*i, bank[i]); | ||
468 | else | ||
469 | wrmsrl(MSR_IA32_MC0_CTL+4*i, ~0UL); | ||
470 | |||
467 | wrmsrl(MSR_IA32_MC0_STATUS+4*i, 0); | 471 | wrmsrl(MSR_IA32_MC0_STATUS+4*i, 0); |
468 | } | 472 | } |
469 | } | 473 | } |