1 files changed, 6 insertions, 8 deletions

diff --git a/arch/arm/mach-ixp2000/include/mach/debug-macro.S b/arch/arm/mach-ixp2000/include/mach/debug-macro.S
index 6a827681680..0ef533b2097 100644
--- a/arch/arm/mach-ixp2000/include/mach/debug-macro.S
+++ b/arch/arm/mach-ixp2000/include/mach/debug-macro.S
@@ -11,16 +11,14 @@
  *
 */
 
-                .macro  addruart, rx, tmp
-                mrc     p15, 0, \rx, c1, c0
-                tst     \rx, #1                 @ MMU enabled?
-                moveq   \rx, #0xc0000000        @ Physical base
-                movne   \rx, #0xfe000000        @ virtual base
-                orrne   \rx, \rx, #0x00f00000
-                orr     \rx, \rx, #0x00030000
+                .macro  addruart, rp, rv
+                mov     \rp, #0x00030000
 #ifdef  __ARMEB__
-                orr     \rx, \rx, #0x00000003
+                orr     \rp, \rp, #0x00000003
 #endif
+                orr     \rv, \rp, #0xfe000000   @ virtual base
+                orr     \rv, \rv, #0x00f00000
+                orr     \rp, \rp, #0xc0000000   @ Physical base
                 .endm
 
 #define UART_SHIFT      2