PATCH: dont assume newer cpus have the same magic registers

From: Alan Cox (alan@lxorguk.ukuu.org.uk)
Date: Sun Jul 27 2003 - 14:58:27 EST


(Venkatesh Pallipadi@intel)
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.6.0-test2/arch/i386/kernel/nmi.c linux-2.6.0-test2-ac1/arch/i386/kernel/nmi.c
--- linux-2.6.0-test2/arch/i386/kernel/nmi.c 2003-07-10 21:10:49.000000000 +0100
+++ linux-2.6.0-test2-ac1/arch/i386/kernel/nmi.c 2003-07-16 18:28:14.000000000 +0100
@@ -162,9 +162,15 @@
         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 @@
         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;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Thu Jul 31 2003 - 22:00:34 EST