patch-2.1.64 linux/include/asm-i386/bugs.h

Next file: linux/include/asm-i386/system.h
Previous file: linux/fs/nfs/inode.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.63/linux/include/asm-i386/bugs.h linux/include/asm-i386/bugs.h
@@ -142,7 +142,7 @@
 	  : "edx" (inp)
 	  : "eax", "ecx", "edx", "edi" );
 	/* If this fails, it means that any user program may lock CPU hard. Too bad. */
-	if (res != 12345678) printk( "Bad.\n" );
+	if (res != 12345678) printk( "Buggy.\n" );
 		        else printk( "Ok.\n" );
 #endif
 }
@@ -172,23 +172,19 @@
  */
 
 extern int pentium_f00f_bug;
+extern void trap_init_f00f_bug(void);
+
 
 __initfunc(static void check_pentium_f00f(void))
 {
 	/*
 	 * Pentium and Pentium MMX
 	 */
-	printk("checking for F00F bug ...");
-	if(x86==5 && !memcmp(x86_vendor_id, "GenuineIntel", 12))
-	{
-		extern void trap_init_f00f_bug(void);
-
-		printk(KERN_INFO "\nIntel Pentium/[MMX] F0 0F bug detected - turning on workaround.\n");
+	pentium_f00f_bug = 0;
+	if (x86==5 && !memcmp(x86_vendor_id, "GenuineIntel", 12)) {
+		printk(KERN_INFO "Intel Pentium with F0 0F bug - workaround enabled.\n");
 		pentium_f00f_bug = 1;
 		trap_init_f00f_bug();
-	} else {
-		printk(KERN_INFO " no F0 0F bug in this CPU, great!\n");
-		pentium_f00f_bug = 0;
 	}
 }
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov