2003-08-11 16:52:14

by Dave Jones

[permalink] [raw]
Subject: [PATCH] sort the cache shift options.

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/arch/i386/Kconfig linux-2.5/arch/i386/Kconfig
--- bk-linus/arch/i386/Kconfig 2003-08-06 16:39:02.000000000 +0100
+++ linux-2.5/arch/i386/Kconfig 2003-08-08 00:38:44.000000000 +0100
@@ -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


2003-08-11 18:34:38

by Roman Zippel

[permalink] [raw]
Subject: Re: [PATCH] sort the cache shift options.

Hi,

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
> --- bk-linus/arch/i386/Kconfig 2003-08-06 16:39:02.000000000 +0100
> +++ linux-2.5/arch/i386/Kconfig 2003-08-08 00:38:44.000000000 +0100
> @@ -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

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

bye, Roman

2003-08-11 18:43:12

by Dave Jones

[permalink] [raw]
Subject: Re: [PATCH] sort the cache shift options.

On Mon, Aug 11, 2003 at 08:31:52PM +0200, Roman Zippel wrote:
> > diff -urpN --exclude-from=/home/davej/.exclude bk-linus/arch/i386/Kconfig linux-2.5/arch/i386/Kconfig
> > --- bk-linus/arch/i386/Kconfig 2003-08-06 16:39:02.000000000 +0100
> > +++ linux-2.5/arch/i386/Kconfig 2003-08-08 00:38:44.000000000 +0100
> > @@ -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
>
> 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

--
Dave Jones http://www.codemonkey.org.uk