diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2012-10-16 16:14:48 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2012-11-26 07:41:05 -0500 |
commit | fb2b1dbadfb1c70f74d298f10e749d261dc0eb58 (patch) | |
tree | 3dfc4d701fda476285dd728fbbb7ef75bf2347ce | |
parent | 9489e9dcae718d5fde988e4a684a0f55b5f94d17 (diff) |
MIPS: Remove R5000A.
From a software perspective R5000 and R5000A are the same thing which is
why the symbol CPU_R5000A never got used, so finally delete it.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/include/asm/cpu.h | 6 | ||||
-rw-r--r-- | arch/mips/mm/tlbex.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h index 52c4e914f95a..90112adb1940 100644 --- a/arch/mips/include/asm/cpu.h +++ b/arch/mips/include/asm/cpu.h | |||
@@ -243,9 +243,9 @@ enum cpu_type_enum { | |||
243 | */ | 243 | */ |
244 | CPU_R4000PC, CPU_R4000SC, CPU_R4000MC, CPU_R4200, CPU_R4300, CPU_R4310, | 244 | CPU_R4000PC, CPU_R4000SC, CPU_R4000MC, CPU_R4200, CPU_R4300, CPU_R4310, |
245 | CPU_R4400PC, CPU_R4400SC, CPU_R4400MC, CPU_R4600, CPU_R4640, CPU_R4650, | 245 | CPU_R4400PC, CPU_R4400SC, CPU_R4400MC, CPU_R4600, CPU_R4640, CPU_R4650, |
246 | CPU_R4700, CPU_R5000, CPU_R5000A, CPU_R5500, CPU_NEVADA, CPU_R5432, | 246 | CPU_R4700, CPU_R5000, CPU_R5500, CPU_NEVADA, CPU_R5432, CPU_R10000, |
247 | CPU_R10000, CPU_R12000, CPU_R14000, CPU_VR41XX, CPU_VR4111, CPU_VR4121, | 247 | CPU_R12000, CPU_R14000, CPU_VR41XX, CPU_VR4111, CPU_VR4121, CPU_VR4122, |
248 | CPU_VR4122, CPU_VR4131, CPU_VR4133, CPU_VR4181, CPU_VR4181A, CPU_RM7000, | 248 | CPU_VR4131, CPU_VR4133, CPU_VR4181, CPU_VR4181A, CPU_RM7000, |
249 | CPU_SR71000, CPU_RM9000, CPU_TX49XX, | 249 | CPU_SR71000, CPU_RM9000, CPU_TX49XX, |
250 | 250 | ||
251 | /* | 251 | /* |
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c index 2833dcb67b5a..9c068acaeaee 100644 --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c | |||
@@ -443,7 +443,6 @@ static void __cpuinit __maybe_unused build_tlb_probe_entry(u32 **p) | |||
443 | case CPU_R4600: | 443 | case CPU_R4600: |
444 | case CPU_R4700: | 444 | case CPU_R4700: |
445 | case CPU_R5000: | 445 | case CPU_R5000: |
446 | case CPU_R5000A: | ||
447 | case CPU_NEVADA: | 446 | case CPU_NEVADA: |
448 | uasm_i_nop(p); | 447 | uasm_i_nop(p); |
449 | uasm_i_tlbp(p); | 448 | uasm_i_tlbp(p); |
@@ -517,7 +516,6 @@ static void __cpuinit build_tlb_write_entry(u32 **p, struct uasm_label **l, | |||
517 | break; | 516 | break; |
518 | 517 | ||
519 | case CPU_R5000: | 518 | case CPU_R5000: |
520 | case CPU_R5000A: | ||
521 | case CPU_NEVADA: | 519 | case CPU_NEVADA: |
522 | uasm_i_nop(p); /* QED specifies 2 nops hazard */ | 520 | uasm_i_nop(p); /* QED specifies 2 nops hazard */ |
523 | uasm_i_nop(p); /* QED specifies 2 nops hazard */ | 521 | uasm_i_nop(p); /* QED specifies 2 nops hazard */ |