Re: weekly O2 patches ;)

[Ralf Baechle <ralf@uni-koblenz.de>]

On Sat, Dec 22, 2001 at 07:28:44PM +0100, Vivien Chappelier wrote:

> diff -Naur linux/arch/mips64/mm/r4xx0.c linux.patch/arch/mips64/mm/r4xx0.c
> --- linux/arch/mips64/mm/r4xx0.c      Sun Dec  9 15:47:14 2001
> +++ linux.patch/arch/mips64/mm/r4xx0.c        Thu Dec 20 19:04:46 2001
> @@ -2141,9 +2141,17 @@
>       unsigned long flags, addr, begin, end, pow2;
>       int tmp;
>  
> -     tmp = ((config >> 17) & 1);
> +     /* XXX: disabling secondary cache for now */
> +     change_cp0_config(CONF_SE, 0);  
> +
> +     tmp = ((config >> 17) & 1); /* check if cache present */
>       if(tmp)
>               return 0;
> +
> +     tmp = ((config >> 12) & 1); /* check if cache enabled */
> +     if(!tmp)
> +             return 0;
> +
>       tmp = ((config >> 22) & 3);
>       switch(tmp) {
>       case 0:

Perfect.  You just broke R4000SC / R4400SC.

  Ralf