Commit f3c1ba85 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] dont assume newer cpus have the same magic registers

(Venkatesh Pallipadi@intel)
parent b28d2708
......@@ -162,9 +162,15 @@ void disable_lapic_nmi_watchdog(void)
case X86_VENDOR_INTEL:
switch (boot_cpu_data.x86) {
case 6:
if (boot_cpu_data.x86_model > 0xd)
break;
wrmsr(MSR_P6_EVNTSEL0, 0, 0);
break;
case 15:
if (boot_cpu_data.x86_model > 0x3)
break;
wrmsr(MSR_P4_IQ_CCCR0, 0, 0);
wrmsr(MSR_P4_CRU_ESCR0, 0, 0);
break;
......@@ -348,9 +354,15 @@ void setup_apic_nmi_watchdog (void)
case X86_VENDOR_INTEL:
switch (boot_cpu_data.x86) {
case 6:
if (boot_cpu_data.x86_model > 0xd)
return;
setup_p6_watchdog();
break;
case 15:
if (boot_cpu_data.x86_model > 0x3)
return;
if (!setup_p4_watchdog())
return;
break;
......
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