[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, 2 insertions, 2 deletions

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 093ccba0503c..7d02f96eeb9d 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -315,9 +315,9 @@ static void __init setup_processor(void)
         cpu_cache = *list->cache;
 #endif
 
-        printk("CPU: %s [%08x] revision %d (ARMv%s)\n",
+        printk("CPU: %s [%08x] revision %d (ARMv%s), cr=%08x\n",
                cpu_name, processor_id, (int)processor_id & 15,
-               proc_arch[cpu_architecture()]);
+               proc_arch[cpu_architecture()], cr_alignment);
 
         sprintf(system_utsname.machine, "%s%c", list->arch_name, ENDIANNESS);
         sprintf(elf_platform, "%s%c", list->elf_name, ENDIANNESS);