diff -urN --exclude-from=/home/davej/.exclude linux/arch/i386/kernel/mtrr.c linux-dj/arch/i386/kernel/mtrr.c
--- linux/arch/i386/kernel/mtrr.c	Fri Mar  9 02:26:57 2001
+++ linux-dj/arch/i386/kernel/mtrr.c	Fri Mar  9 02:55:40 2001
@@ -231,6 +231,10 @@
   v1.37
     20001109   H. Peter Anvin <hpa@zytor.com>
 	       Use the new centralized CPU feature detects.
+
+  v1.38
+    20010309   Dave Jones <davej@suse.de>
+	       Add support for Cyrix III.
 */
 #include <linux/types.h>
 #include <linux/errno.h>
@@ -1978,6 +1982,14 @@
 			size_and_mask = ~size_or_mask & 0xfff00000;
 			break;
 		}
+	case X86_VENDOR_CENTAUR:
+		/* Cyrix III has Intel style MTRRs, but doesn't support PAE */
+		if (boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model == 6) {
+			size_or_mask  = 0xfff00000; /* 32 bits */
+			size_and_mask = 0;
+		}
+		break;
+
 	default:
 		/* Intel, etc. */
 		size_or_mask  = 0xff000000; /* 36 bits */