Skip to contentSkip to conversation

sort the cache shift options.

PATCH In review [email protected] 2 participants 3 messages Aug 11, 2003

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sort the cache shift options.

arch/i386/Kconfig +1 -1
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/arch/i386/Kconfig linux-2.5/arch/i386/Kconfig
@@ -322,10 +322,10 @@ config X86_XADD
 
 config X86_L1_CACHE_SHIFT
 	int
-	default "7" if MPENTIUM4 || X86_GENERIC
 	default "4" if MELAN || M486 || M386
 	default "5" if MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCRUSOE || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2
 	default "6" if MK7 || MK8
+	default "7" if MPENTIUM4 || X86_GENERIC
 
 config RWSEM_GENERIC_SPINLOCK
 	bool
#1 lore raw

Hi,

Quoted 5 lines · On Mon, 11 Aug 2003 [email protected] wrote:

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/arch/i386/Kconfig linux-2.5/arch/i386/Kconfig

arch/i386/Kconfig +0 -0
@@ -322,10 +322,10 @@ config X86_XADD
 

arch/i386/Kconfig config X86_XADD · line 331

Quoted 10 lines
arch/i386/Kconfig +1 -1
 config X86_L1_CACHE_SHIFT
 	int
-	default "7" if MPENTIUM4 || X86_GENERIC
 	default "4" if MELAN || M486 || M386
 	default "5" if MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCRUSOE || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2
 	default "6" if MK7 || MK8
+	default "7" if MPENTIUM4 || X86_GENERIC
 
 config RWSEM_GENERIC_SPINLOCK
 	bool

The order does matter, in this case we want to override the cpu selection with X86_GENERIC.

bye, Roman

author
#2 lore raw
Quoted 13 lines · Roman Zippel
Quoted 13 lines

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/arch/i386/Kconfig linux-2.5/arch/i386/Kconfig

arch/i386/Kconfig +1 -1
@@ -322,10 +322,10 @@ config X86_XADD
 
 config X86_L1_CACHE_SHIFT
 	int
-	default "7" if MPENTIUM4 || X86_GENERIC
 	default "4" if MELAN || M486 || M386
 	default "5" if MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCRUSOE || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2
 	default "6" if MK7 || MK8
+	default "7" if MPENTIUM4 || X86_GENERIC
 
Quoted 5 lines

arch/i386/Kconfig config X86_XADD · line 331

Quoted 2 lines
arch/i386/Kconfig +0 -0
 config RWSEM_GENERIC_SPINLOCK
 	bool

The order does matter, in this case we want to override the cpu selection with X86_GENERIC.

Ohhh. Ok, I see how that works. Bit icky though, and non-obvious to someone stupid like me.

Dave

Signature · 1 line
 Dave Jones     http://www.codemonkey.org.uk