X-Git-Url: http://bbs.cooldavid.org/git/?a=blobdiff_plain;f=arch%2Farm%2Fmach-orion5x%2Finclude%2Fmach%2Fdebug-macro.S;h=5e3bf5b68aecae6da23e23fdd4f204a3602e991d;hb=0ea1293009826da45e1019f45dfde1e557bb30df;hp=91e0e39bb23f1602a98068234c28268f262e455c;hpb=2fb20b61550d3c5335e59819ed22734900d4d6e3;p=net-next-2.6.git

diff --git a/arch/arm/mach-orion5x/include/mach/debug-macro.S b/arch/arm/mach-orion5x/include/mach/debug-macro.S
index 91e0e39bb23..5e3bf5b68ae 100644
--- a/arch/arm/mach-orion5x/include/mach/debug-macro.S
+++ b/arch/arm/mach-orion5x/include/mach/debug-macro.S
@@ -10,12 +10,11 @@
 
 #include <mach/orion5x.h>
 
-	.macro  addruart, rx, tmp
-	mrc	p15, 0, \rx, c1, c0
-	tst	\rx, #1					@ MMU enabled?
-	ldreq	\rx, =ORION5X_REGS_PHYS_BASE
-	ldrne	\rx, =ORION5X_REGS_VIRT_BASE
-	orr	\rx, \rx, #0x00012000
+	.macro  addruart, rp, rv
+	ldr	\rp, =ORION5X_REGS_PHYS_BASE
+	ldr	\rv, =ORION5X_REGS_VIRT_BASE
+	orr	\rp, \rp, #0x00012000
+	orr	\rv, \rv, #0x00012000
 	.endm
 
 #define UART_SHIFT	2