1 files changed, 19 insertions, 3 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