[ARM] Remove yucky ifdefs to print "id(wb)BRR" suffix on CPU name

The "id(wb)BRR" suffix reports which CPU debugging options were (or
were not) selected at kernel build time.  Rather than have every
proc-*.S file implement this, report the control register value,
from which this information can be deduced.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 1 insertions, 13 deletions

diff --git a/arch/arm/mm/proc-arm922.S b/arch/arm/mm/proc-arm922.S
index 9e57c34f5c09..33dae4929f09 100644
--- a/arch/arm/mm/proc-arm922.S
+++ b/arch/arm/mm/proc-arm922.S
@@ -448,19 +448,7 @@ cpu_elf_name:
 
         .type   cpu_arm922_name, #object
 cpu_arm922_name:
-        .ascii  "ARM922T"
-#ifndef CONFIG_CPU_ICACHE_DISABLE
-        .ascii  "i"
-#endif
-#ifndef CONFIG_CPU_DCACHE_DISABLE
-        .ascii  "d"
-#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH
-        .ascii  "(wt)"
-#else
-        .ascii  "(wb)"
-#endif
-#endif
-        .ascii  "\0"
+        .asciz  "ARM922T"
         .size   cpu_arm922_name, . - cpu_arm922_name
 
         .align