Re: [PATCH] [RFC] [2.5 i386] GCC 3.1 -march support, PPRO_FENCE reduction, prefetch fixes and other CPU-related changes

[Luca Barbieri <ldb@ldb.ods.org>]

[-- Attachment #1: Type: text/plain, Size: 2470 bytes --]

> PPro fence is required for uniprocessor pentium pro.

This should fix this and the CONFIG_MK6(II) issue.


diff --exclude-from=/home/ldb/src/linux-exclude -urNd a/arch/i386/Config.help b/arch/i386/Config.help
--- a/arch/i386/Config.help	2002-08-04 16:39:50.000000000 +0200
+++ b/arch/i386/Config.help	2002-08-04 16:38:53.000000000 +0200
@@ -490,7 +490,7 @@
   Select this for an AMD K6 processor.  Enables use of some extended
   instructions, and passes appropriate optimization flags to GCC.
 
-CONFIG_MK6
+CONFIG_MK6II
   Select this for an AMD K6-2/K6-3D or K6-3.  Enables use of some
   extended instructions, passes appropriate optimization flags to GCC
   and enables 3DNow!
@@ -528,7 +528,7 @@
   can increase performance of some operations.
 
 CONFIG_X86_PPRO_FENCE
-  Allows the kernel to run on Pentium Pro SMP systems by supporting a
+  Allows the kernel to run on Pentium Pro systems by supporting a
   workaround for the store ordering bug present on them.
   This slows down all processors except WinChips since they already do
   out-of-order stores.
diff --exclude-from=/home/ldb/src/linux-exclude -urNd a/arch/i386/config.in b/arch/i386/config.in
--- a/arch/i386/config.in	2002-08-04 16:39:50.000000000 +0200
+++ b/arch/i386/config.in	2002-08-04 16:35:24.000000000 +0200
@@ -214,7 +214,7 @@
    define_bool CONFIG_X86_F00F_BUG y
 fi
 if [ "$CONFIG_X86_USE_SSE_PREFETCH" != "y" -a "$CONFIG_X86_USE_3DNOW" != "y" -a "$CONFIG_X86_OOSTORE" != "y" ]; then
-   dep_bool 'Support Pentium Pro SMP and slow down all processors' CONFIG_X86_PPRO_FENCE $CONFIG_SMP
+   dep_bool 'Support Pentium Pro and slow down all processors' CONFIG_X86_PPRO_FENCE
 fi
 
 bool 'Symmetric multi-processing support' CONFIG_SMP
diff --exclude-from=/home/ldb/src/linux-exclude -urNd a/include/asm-i386/bugs.h b/include/asm-i386/bugs.h
--- a/include/asm-i386/bugs.h	2002-08-04 16:39:51.000000000 +0200
+++ b/include/asm-i386/bugs.h	2002-08-04 16:40:12.000000000 +0200
@@ -199,12 +199,12 @@
 		panic("Kernel compiled for PMMX+, assumes a local APIC without the read-before-write bug!");
 #endif
 
-#if !defined(CONFIG_X86_PPRO_FENCE) && defined(CONFIG_SMP)
+#if !defined(CONFIG_X86_PPRO_FENCE)
 	if(boot_cpu_data.x86_vendor == X86_VENDOR_INTEL
 	   && boot_cpu_data.x86 == 6
 	   && boot_cpu_data.x86_model <= 1
 		)
-		panic("Kernel compiled without Pentium Pro SMP support!");
+		panic("Kernel compiled without Pentium Pro support!");
 #endif
 
 #if defined(CONFIG_X86_USE_3DNOW)

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]