Commit b8f652d5 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

[PATCH] Minor 32bit Opteron fixes

Don't disable the Northbridge Machine Check.

Use the unrolled "INTEL_USERCOPY" too.
parent 533fa454
......@@ -345,7 +345,7 @@ config X86_GOOD_APIC
config X86_INTEL_USERCOPY
bool
depends on MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M586MMX
depends on MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK7
default y
config X86_USE_PPRO_CHECKSUM
......
......@@ -82,9 +82,6 @@ void __init amd_mcheck_init(struct cpuinfo_x86 *c)
nr_mce_banks = l & 0xff;
for (i=0; i<nr_mce_banks; i++) {
/* Don't enable northbridge MCE by default on Hammer */
if (boot_cpu_data.x86_model == 15 && i == 4)
continue;
wrmsr (MSR_IA32_MC0_CTL+4*i, 0xffffffff, 0xffffffff);
wrmsr (MSR_IA32_MC0_STATUS+4*i, 0x0, 0x0);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment