patch-2.4.0-test10 linux/include/asm-i386/bugs.h

• Lines: 23
• Date: Tue Oct 31 11:18:04 2000
• Orig file: v2.4.0-test9/linux/include/asm-i386/bugs.h
• Orig date: Fri Sep 8 12:52:39 2000

diff -u --recursive --new-file v2.4.0-test9/linux/include/asm-i386/bugs.h linux/include/asm-i386/bugs.h
@@ -94,7 +94,6 @@
 		printk(KERN_INFO "Enabling unmasked SIMD FPU exception support... ");
 		set_in_cr4(X86_CR4_OSXMMEXCPT);
 		printk("done.\n");
-		load_mxcsr(0x1f80);
 	}
 #endif
 
@@ -166,6 +165,7 @@
 static void __init check_amd_k6(void)
 {
 	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD &&
+	    boot_cpu_data.x86 == 5 &&
 	    boot_cpu_data.x86_model == 6 &&
 	    boot_cpu_data.x86_mask == 1)
 	{
@@ -426,5 +426,5 @@
 	check_pentium_f00f();
 #endif
 	check_cyrix_coma();
-	system_utsname.machine[1] = '0' + boot_cpu_data.x86;
+	system_utsname.machine[1] = '0' + (boot_cpu_data.x86 > 6 ? 6 : boot_cpu_data.x86);
 }