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

• Lines: 26
• Date: Fri Oct 22 12:46:18 1999
• Orig file: v2.3.22/linux/include/asm-i386/bugs.h
• Orig date: Tue Sep 7 12:14:07 1999

diff -u --recursive --new-file v2.3.22/linux/include/asm-i386/bugs.h linux/include/asm-i386/bugs.h
@@ -236,6 +236,7 @@
  * have the F0 0F bug, which lets nonpriviledged users lock up the system:
  */
 
+#ifndef CONFIG_M686
 extern void trap_init_f00f_bug(void);
 
 static void __init check_pentium_f00f(void)
@@ -250,6 +251,7 @@
 		trap_init_f00f_bug();
 	}
 }
+#endif
 
 /*
  * Perform the Cyrix 5/2 test. A Cyrix won't change
@@ -424,7 +426,9 @@
 	check_hlt();
 	check_popad();
 	check_amd_k6();
+#ifndef CONFIG_M686
 	check_pentium_f00f();
+#endif
 	check_cyrix_coma();
 	system_utsname.machine[1] = '0' + boot_cpu_data.x86;
 }