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

• Lines: 22
• Date: Thu Apr 30 12:51:33 1998
• Orig file: v2.1.98/linux/include/asm-i386/bugs.h
• Orig date: Wed Apr 1 20:11:54 1998

diff -u --recursive --new-file v2.1.98/linux/include/asm-i386/bugs.h linux/include/asm-i386/bugs.h
@@ -14,6 +14,10 @@
 #include <linux/config.h>
 #include <asm/processor.h>
 
+#ifdef CONFIG_MTRR
+#  include <asm/mtrr.h>
+#endif
+
 #define CONFIG_BUGi386
 
 __initfunc(static void no_halt(char *s, int *ints))
@@ -236,4 +240,10 @@
 	check_amd_k6();
 	check_pentium_f00f();
 	system_utsname.machine[1] = '0' + boot_cpu_data.x86;
+#if !defined(__SMP__) && defined(CONFIG_MTRR)
+	/*  Must be done after other processors booted: at this point we are
+	    called before SMP initialisation, so this is for the non-SMP case
+	    only. The SMP case is handled in arch/i386/kernel/smp.c  */
+	mtrr_init ();
+#endif
 }