4 files changed, 19 insertions, 22 deletions

diff --git a/include/asm-mips/cpu-features.h b/include/asm-mips/cpu-features.h
index d95a83e3e1d7..81f19aebc0db 100644
--- a/include/asm-mips/cpu-features.h
+++ b/include/asm-mips/cpu-features.h
@@ -35,9 +35,6 @@
 #ifndef cpu_has_tx39_cache
 #define cpu_has_tx39_cache      (cpu_data[0].options & MIPS_CPU_TX39_CACHE)
 #endif
-#ifndef cpu_has_sb1_cache
-#define cpu_has_sb1_cache       (cpu_data[0].options & MIPS_CPU_SB1_CACHE)
-#endif
 #ifndef cpu_has_fpu
 #define cpu_has_fpu             (current_cpu_data.options & MIPS_CPU_FPU)
 #define raw_cpu_has_fpu         (raw_current_cpu_data.options & MIPS_CPU_FPU)
diff --git a/include/asm-mips/cpu.h b/include/asm-mips/cpu.h
index d67f43b09964..107ccbeee294 100644
--- a/include/asm-mips/cpu.h
+++ b/include/asm-mips/cpu.h
@@ -255,24 +255,23 @@
 #define MIPS_CPU_3K_CACHE       0x00000004 /* R3000-style caches */
 #define MIPS_CPU_4K_CACHE       0x00000008 /* R4000-style caches */
 #define MIPS_CPU_TX39_CACHE     0x00000010 /* TX3900-style caches */
-#define MIPS_CPU_SB1_CACHE      0x00000020 /* SB1-style caches */
-#define MIPS_CPU_FPU            0x00000040 /* CPU has FPU */
-#define MIPS_CPU_32FPR          0x00000080 /* 32 dbl. prec. FP registers */
-#define MIPS_CPU_COUNTER        0x00000100 /* Cycle count/compare */
-#define MIPS_CPU_WATCH          0x00000200 /* watchpoint registers */
-#define MIPS_CPU_DIVEC          0x00000400 /* dedicated interrupt vector */
-#define MIPS_CPU_VCE            0x00000800 /* virt. coherence conflict possible */
-#define MIPS_CPU_CACHE_CDEX_P   0x00001000 /* Create_Dirty_Exclusive CACHE op */
-#define MIPS_CPU_CACHE_CDEX_S   0x00002000 /* ... same for seconary cache ... */
-#define MIPS_CPU_MCHECK         0x00004000 /* Machine check exception */
-#define MIPS_CPU_EJTAG          0x00008000 /* EJTAG exception */
-#define MIPS_CPU_NOFPUEX        0x00010000 /* no FPU exception */
-#define MIPS_CPU_LLSC           0x00020000 /* CPU has ll/sc instructions */
-#define MIPS_CPU_INCLUSIVE_CACHES       0x00040000 /* P-cache subset enforced */
-#define MIPS_CPU_PREFETCH       0x00080000 /* CPU has usable prefetch */
-#define MIPS_CPU_VINT           0x00100000 /* CPU supports MIPSR2 vectored interrupts */
-#define MIPS_CPU_VEIC           0x00200000 /* CPU supports MIPSR2 external interrupt controller mode */
-#define MIPS_CPU_ULRI           0x00400000 /* CPU has ULRI feature */
+#define MIPS_CPU_FPU            0x00000020 /* CPU has FPU */
+#define MIPS_CPU_32FPR          0x00000040 /* 32 dbl. prec. FP registers */
+#define MIPS_CPU_COUNTER        0x00000080 /* Cycle count/compare */
+#define MIPS_CPU_WATCH          0x00000100 /* watchpoint registers */
+#define MIPS_CPU_DIVEC          0x00000200 /* dedicated interrupt vector */
+#define MIPS_CPU_VCE            0x00000400 /* virt. coherence conflict possible */
+#define MIPS_CPU_CACHE_CDEX_P   0x00000800 /* Create_Dirty_Exclusive CACHE op */
+#define MIPS_CPU_CACHE_CDEX_S   0x00001000 /* ... same for seconary cache ... */
+#define MIPS_CPU_MCHECK         0x00002000 /* Machine check exception */
+#define MIPS_CPU_EJTAG          0x00004000 /* EJTAG exception */
+#define MIPS_CPU_NOFPUEX        0x00008000 /* no FPU exception */
+#define MIPS_CPU_LLSC           0x00010000 /* CPU has ll/sc instructions */
+#define MIPS_CPU_INCLUSIVE_CACHES       0x00020000 /* P-cache subset enforced */
+#define MIPS_CPU_PREFETCH       0x00040000 /* CPU has usable prefetch */
+#define MIPS_CPU_VINT           0x00080000 /* CPU supports MIPSR2 vectored interrupts */
+#define MIPS_CPU_VEIC           0x00100000 /* CPU supports MIPSR2 external interrupt controller mode */
+#define MIPS_CPU_ULRI           0x00200000 /* CPU has ULRI feature */
 
 /*
  * CPU ASE encodings
diff --git a/include/asm-mips/linkage.h b/include/asm-mips/linkage.h
index b6185d3cfe68..e9a940d1b0c6 100644
--- a/include/asm-mips/linkage.h
+++ b/include/asm-mips/linkage.h
@@ -5,4 +5,6 @@
 #include <asm/asm.h>
 #endif
 
+#define __weak __attribute__((weak))
+
 #endif
diff --git a/include/asm-mips/mach-cobalt/cpu-feature-overrides.h b/include/asm-mips/mach-cobalt/cpu-feature-overrides.h
index d38f069d9e95..b3314cf53194 100644
--- a/include/asm-mips/mach-cobalt/cpu-feature-overrides.h
+++ b/include/asm-mips/mach-cobalt/cpu-feature-overrides.h
@@ -14,7 +14,6 @@
 #define cpu_has_3k_cache        0
 #define cpu_has_4k_cache        1
 #define cpu_has_tx39_cache      0
-#define cpu_has_sb1_cache       0
 #define cpu_has_fpu             1
 #define cpu_has_32fpr           1
 #define cpu_has_counter         1