linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* PATCH: dont assume newer cpus have the same magic registers
@ 2003-07-27 19:58 Alan Cox
  0 siblings, 0 replies; only message in thread
From: Alan Cox @ 2003-07-27 19:58 UTC (permalink / raw)
  To: linux-kernel, torvalds

(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;

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2003-07-28  1:50 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-07-27 19:58 PATCH: dont assume newer cpus have the same magic registers Alan Cox

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).