diff -urN --exclude-from=/home/davej/.exclude linux-ac/Documentation/Configure.help linux-dj/Documentation/Configure.help
--- linux-ac/Documentation/Configure.help	Thu Aug 23 22:32:09 2001
+++ linux-dj/Documentation/Configure.help	Fri Aug 24 01:04:02 2001
@@ -3639,7 +3639,7 @@
    - "Winchip-C6" for original IDT Winchip.
    - "Winchip-2" for IDT Winchip 2.
    - "Winchip-2A" for IDT Winchips with 3dNow! capabilities.
-   - "CyrixIII" for VIA Cyrix III or VIA C3.
+   - "CyrixIII" for VIA Cyrix III, VIA C3 or VIA C5M.
 
   If you don't know what to do, choose "386".
 
diff -urN --exclude-from=/home/davej/.exclude linux-ac/arch/i386/config.in linux-dj/arch/i386/config.in
--- linux-ac/arch/i386/config.in	Thu Aug 23 22:32:10 2001
+++ linux-dj/arch/i386/config.in	Fri Aug 24 01:04:02 2001
@@ -41,7 +41,7 @@
 	 Winchip-C6				CONFIG_MWINCHIPC6 \
 	 Winchip-2				CONFIG_MWINCHIP2 \
 	 Winchip-2A/Winchip-3			CONFIG_MWINCHIP3D \
-	 CyrixIII/C3				CONFIG_MCYRIXIII" Pentium-Pro
+	 CyrixIII/C3/C5M			CONFIG_MCYRIXIII" Pentium-Pro
 #
 # Define implied options from the CPU selection here
 #
diff -urN --exclude-from=/home/davej/.exclude linux-ac/arch/i386/kernel/mtrr.c linux-dj/arch/i386/kernel/mtrr.c
--- linux-ac/arch/i386/kernel/mtrr.c	Thu Aug 23 22:32:10 2001
+++ linux-dj/arch/i386/kernel/mtrr.c	Fri Aug 24 01:04:02 2001
@@ -2127,10 +2119,8 @@
 		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 ||
-			 boot_cpu_data.x86_model == 7)) {
+		/* VIA Cyrix family have Intel style MTRRs, but don't support PAE */
+		if (boot_cpu_data.x86 == 6) {
 			size_or_mask  = 0xfff00000; /* 32 bits */
 			size_and_mask = 0;
 		}
diff -urN --exclude-from=/home/davej/.exclude linux-ac/arch/i386/kernel/setup.c linux-dj/arch/i386/kernel/setup.c
--- linux-ac/arch/i386/kernel/setup.c	Thu Aug 23 22:32:10 2001
+++ linux-dj/arch/i386/kernel/setup.c	Fri Aug 24 01:03:40 2001
@@ -67,6 +67,9 @@
  *
  *  AMD Athlon/Duron/Thunderbird bluesmoke support.
  *  Dave Jones <davej@suse.de>, April 2001.
+ *
+ *  VIA C5M Support, increased msr.h usage.
+ *  Dave Jones <davej@suse.de>, August 2001
  */
 
 /*
@@ -1904,7 +1907,7 @@
 
 		case 6:
 			switch (c->x86_model) {
-				case 6 ... 7:		/* Cyrix III or C3 */
+				case 6 ... 8:		/* Cyrix III family */
 					rdmsr (MSR_VIA_FCR, lo, hi);
 					lo |= (1<<1 | 1<<7);	/* Report CX8 & enable PGE */
 					wrmsr (MSR_VIA_FCR, lo, hi);
@@ -1914,7 +1917,7 @@
 
 					get_model_name(c);
 					display_cacheinfo(c);
-					
+
 					rdmsr(MSR_IA32_EBL_CR_POWERON, lo, hi);
 					interpret_eblcr(c, lo, 0);
 					break;