X-Git-Url: http://bbs.cooldavid.org/git/?a=blobdiff_plain;f=arch%2Farm%2Fmach-gemini%2Finclude%2Fmach%2Fdebug-macro.S;h=f40e006d296e66d884d63525e25d7db45517f41c;hb=0ea1293009826da45e1019f45dfde1e557bb30df;hp=ad477047069ddc9188e33657f3ad0b5338b83e11;hpb=1ea64615601229f0dc16dee91dc5b50216411baa;p=net-next-2.6.git

diff --git a/arch/arm/mach-gemini/include/mach/debug-macro.S b/arch/arm/mach-gemini/include/mach/debug-macro.S
index ad477047069..f40e006d296 100644
--- a/arch/arm/mach-gemini/include/mach/debug-macro.S
+++ b/arch/arm/mach-gemini/include/mach/debug-macro.S
@@ -11,11 +11,9 @@
  */
 #include <mach/hardware.h>
 
-	.macro	addruart, rx, tmp
-	mrc	p15, 0, \rx, c1, c0
-	tst	\rx, #1					@ MMU enabled?
-	ldreq	\rx, =GEMINI_UART_BASE			@ physical
-	ldrne	\rx, =IO_ADDRESS(GEMINI_UART_BASE)	@ virtual
+	.macro	addruart, rp, rv
+	ldr	\rp, =GEMINI_UART_BASE			@ physical
+	ldr	\rv, =IO_ADDRESS(GEMINI_UART_BASE)	@ virtual
 	.endm
 
 #define UART_SHIFT	2