56 files changed, 440 insertions, 454 deletions

diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S
index f91395206a4b..a0f07521ca8a 100644
--- a/arch/arm/kernel/debug.S
+++ b/arch/arm/kernel/debug.S
@@ -22,7 +22,7 @@
 #if defined(CONFIG_DEBUG_ICEDCC)
                 @@ debug using ARM EmbeddedICE DCC channel
 
-                .macro  addruart, rx, tmp
+                .macro  addruart, rp, rv
                 .endm
 
 #if defined(CONFIG_CPU_V6)
@@ -121,6 +121,22 @@ wait:		mrc	p14, 0, pc, c0, c1, 0
 #include <mach/debug-macro.S>
 #endif  /* CONFIG_DEBUG_ICEDCC */
 
+#ifdef CONFIG_MMU
+                .macro  addruart_current, rx, tmp1, tmp2
+                addruart        \tmp1, \tmp2
+                mrc             p15, 0, \rx, c1, c0
+                tst             \rx, #1
+                moveq           \rx, \tmp1
+                movne           \rx, \tmp2
+                .endm
+
+#else /* !CONFIG_MMU */
+                .macro  addruart_current, rx, tmp1, tmp2
+                addruart        \rx, \tmp1
+                .endm
+
+#endif /* CONFIG_MMU */
+
 /*
  * Useful debugging routines
  */
@@ -155,7 +171,7 @@ ENDPROC(printhex2)
                 .ltorg
 
 ENTRY(printascii)
-                addruart r3, r1
+                addruart_current r3, r1, r2
                 b       2f
 1:              waituart r2, r3
                 senduart r1, r3
@@ -171,7 +187,7 @@ ENTRY(printascii)
 ENDPROC(printascii)
 
 ENTRY(printch)
-                addruart r3, r1
+                addruart_current r3, r1, r2
                 mov     r1, r0
                 mov     r0, #0
                 b       1b
diff --git a/arch/arm/mach-aaec2000/include/mach/debug-macro.S b/arch/arm/mach-aaec2000/include/mach/debug-macro.S
index a9cac368bfe6..bc7ad5561c4c 100644
--- a/arch/arm/mach-aaec2000/include/mach/debug-macro.S
+++ b/arch/arm/mach-aaec2000/include/mach/debug-macro.S
@@ -10,12 +10,10 @@
  */
 
 #include "hardware.h"
-                .macro  addruart, rx, tmp
-                mrc     p15, 0, \rx, c1, c0
-                tst     \rx, #1                 @ MMU enabled?
-                moveq   \rx, #0x80000000                @ physical
-                movne   \rx, #io_p2v(0x80000000)        @ virtual
-                orr     \rx, \rx, #0x00000800
+                .macro  addruart, rp, rv
+                mov     \rp, 0x00000800
+                orr     \rv, \rp, #io_p2v(0x80000000)   @ virtual
+                orr     \rp, \rp, #0x80000000           @ physical
                 .endm
 
                 .macro  senduart,rd,rx
diff --git a/arch/arm/mach-at91/include/mach/debug-macro.S b/arch/arm/mach-at91/include/mach/debug-macro.S
index 9e750a1c1b5a..0f959faf74a9 100644
--- a/arch/arm/mach-at91/include/mach/debug-macro.S
+++ b/arch/arm/mach-at91/include/mach/debug-macro.S
@@ -14,11 +14,9 @@
 #include <mach/hardware.h>
 #include <mach/at91_dbgu.h>
 
-        .macro  addruart, rx, tmp
-        mrc     p15, 0, \rx, c1, c0
-        tst     \rx, #1                                         @ MMU enabled?
-        ldreq   \rx, =(AT91_BASE_SYS + AT91_DBGU)               @ System peripherals (phys address)
-        ldrne   \rx, =(AT91_VA_BASE_SYS + AT91_DBGU)            @ System peripherals (virt address)
+        .macro  addruart, rp, rv
+        ldr     \rp, =(AT91_BASE_SYS + AT91_DBGU)               @ System peripherals (phys address)
+        ldr     \rv, =(AT91_VA_BASE_SYS + AT91_DBGU)            @ System peripherals (virt address)
         .endm
 
         .macro  senduart,rd,rx
diff --git a/arch/arm/mach-clps711x/include/mach/debug-macro.S b/arch/arm/mach-clps711x/include/mach/debug-macro.S
index 072cc6b61ba3..507c6873b7ee 100644
--- a/arch/arm/mach-clps711x/include/mach/debug-macro.S
+++ b/arch/arm/mach-clps711x/include/mach/debug-macro.S
@@ -14,16 +14,14 @@