MIPS machines define a macro in cpu-feature-overrides.h that specifies the cache style they use. Several machines have a typo in this macro that will cause the kernel to panic early in the boot process. The attached patch fixes these typos so the correct cache style is defined. Signed-off-by: Joshua Kinard <kumba@xxxxxxxxxx> --- mach-ip22/cpu-feature-overrides.h | 2 +- mach-mips/cpu-feature-overrides.h | 4 ++-- mach-rm200/cpu-feature-overrides.h | 2 +- mach-sim/cpu-feature-overrides.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-)
diff -Naurp mipslinux/include/asm-mips/mach-ip22/cpu-feature-overrides.h mipslinux-4kcache/include/asm-mips/mach-ip22/cpu-feature-overrides.h --- mipslinux/include/asm-mips/mach-ip22/cpu-feature-overrides.h 2006-01-22 21:14:29.000000000 -0500 +++ mipslinux-4kcache/include/asm-mips/mach-ip22/cpu-feature-overrides.h 2006-01-24 13:41:14.000000000 -0500 @@ -13,7 +13,7 @@ */ #define cpu_has_tlb 1 #define cpu_has_4kex 1 -#define cpu_has_4kcache 1 +#define cpu_has_4k_cache 1 #define cpu_has_fpu 1 #define cpu_has_32fpr 1 #define cpu_has_counter 1 diff -Naurp mipslinux/include/asm-mips/mach-mips/cpu-feature-overrides.h mipslinux-4kcache/include/asm-mips/mach-mips/cpu-feature-overrides.h --- mipslinux/include/asm-mips/mach-mips/cpu-feature-overrides.h 2006-01-22 21:14:29.000000000 -0500 +++ mipslinux-4kcache/include/asm-mips/mach-mips/cpu-feature-overrides.h 2006-01-24 13:41:14.000000000 -0500 @@ -17,7 +17,7 @@ #ifdef CONFIG_CPU_MIPS32 #define cpu_has_tlb 1 #define cpu_has_4kex 1 -#define cpu_has_4kcache 1 +#define cpu_has_4k_cache 1 /* #define cpu_has_fpu ? */ /* #define cpu_has_32fpr ? */ #define cpu_has_counter 1 @@ -43,7 +43,7 @@ #ifdef CONFIG_CPU_MIPS64 #define cpu_has_tlb 1 #define cpu_has_4kex 1 -#define cpu_has_4kcache 1 +#define cpu_has_4k_cache 1 /* #define cpu_has_fpu ? */ /* #define cpu_has_32fpr ? */ #define cpu_has_counter 1 diff -Naurp mipslinux/include/asm-mips/mach-rm200/cpu-feature-overrides.h mipslinux-4kcache/include/asm-mips/mach-rm200/cpu-feature-overrides.h --- mipslinux/include/asm-mips/mach-rm200/cpu-feature-overrides.h 2006-01-22 21:14:29.000000000 -0500 +++ mipslinux-4kcache/include/asm-mips/mach-rm200/cpu-feature-overrides.h 2006-01-24 13:41:14.000000000 -0500 @@ -14,7 +14,7 @@ #define cpu_has_tlb 1 #define cpu_has_4kex 1 -#define cpu_has_4kcache 1 +#define cpu_has_4k_cache 1 #define cpu_has_fpu 1 #define cpu_has_32fpr 1 #define cpu_has_counter 1 diff -Naurp mipslinux/include/asm-mips/mach-sim/cpu-feature-overrides.h mipslinux-4kcache/include/asm-mips/mach-sim/cpu-feature-overrides.h --- mipslinux/include/asm-mips/mach-sim/cpu-feature-overrides.h 2006-01-22 21:14:29.000000000 -0500 +++ mipslinux-4kcache/include/asm-mips/mach-sim/cpu-feature-overrides.h 2006-01-24 13:41:14.000000000 -0500 @@ -16,7 +16,7 @@ #ifdef CONFIG_CPU_MIPS32 #define cpu_has_tlb 1 #define cpu_has_4kex 1 -#define cpu_has_4kcache 1 +#define cpu_has_4k_cache 1 #define cpu_has_fpu 0 /* #define cpu_has_32fpr ? */ #define cpu_has_counter 1 @@ -41,7 +41,7 @@ #ifdef CONFIG_CPU_MIPS64 #define cpu_has_tlb 1 #define cpu_has_4kex 1 -#define cpu_has_4kcache 1 +#define cpu_has_4k_cache 1 /* #define cpu_has_fpu ? */ /* #define cpu_has_32fpr ? */ #define cpu_has_counter 1
