[ARM] nommu: manage the CP15 things

All the current CP15 access codes in ARM arch can be categorized and
conditioned by the defines as follows:

     Related operation	Safe condition
  a. any CP15 access	!CPU_CP15
  b. alignment trap	CPU_CP15_MMU
  c. D-cache(C-bit)	CPU_CP15
  d. I-cache		CPU_CP15 && !( CPU_ARM610 || CPU_ARM710 ||
				CPU_ARM720 || CPU_ARM740 ||
				CPU_XSCALE || CPU_XSC3 )
  e. alternate vector	CPU_CP15 && !CPU_ARM740
  f. TTB		CPU_CP15_MMU
  g. Domain		CPU_CP15_MMU
  h. FSR/FAR		CPU_CP15_MMU

For example, alternate vector is supported if and only if
"CPU_CP15 && !CPU_ARM740" is satisfied.

Signed-off-by: Hyok S. Choi <hyok.choi@samsung.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 16 insertions, 6 deletions

diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 3079535afccd..bf35c178a877 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -221,16 +221,26 @@ void __show_regs(struct pt_regs *regs)
                 processor_modes[processor_mode(regs)],
                 thumb_mode(regs) ? " (T)" : "",
                 get_fs() == get_ds() ? "kernel" : "user");
+#if CONFIG_CPU_CP15
         {
-                unsigned int ctrl, transbase, dac;
+                unsigned int ctrl;
                   __asm__ (
                 "       mrc p15, 0, %0, c1, c0\n"
-                "       mrc p15, 0, %1, c2, c0\n"
-                "       mrc p15, 0, %2, c3, c0\n"
-                : "=r" (ctrl), "=r" (transbase), "=r" (dac));
-                printk("Control: %04X  Table: %08X  DAC: %08X\n",
-                        ctrl, transbase, dac);
+                : "=r" (ctrl));
+                printk("Control: %04X\n", ctrl);
         }
+#ifdef CONFIG_CPU_CP15_MMU
+        {
+                unsigned int transbase, dac;
+                  __asm__ (
+                "       mrc p15, 0, %0, c2, c0\n"
+                "       mrc p15, 0, %1, c3, c0\n"
+                : "=r" (transbase), "=r" (dac));
+                printk("Table: %08X  DAC: %08X\n",
+                        transbase, dac);
+        }
+#endif
+#endif
 }
 
 void show_regs(struct pt_regs * regs)