X-Git-Url: http://bbs.cooldavid.org/git/?a=blobdiff_plain;f=arch%2Farm%2Fmach-vexpress%2Finclude%2Fmach%2Fdebug-macro.S;h=050d65e02a42a9dc4e6923bde6eb474a9a7da41a;hb=0ea1293009826da45e1019f45dfde1e557bb30df;hp=5167e2aceeba9f8a070db5c8b91b3c0936f4f59f;hpb=b42f5b0f0fd8c1c442c1b29a3fbcb338e8bd7732;p=net-next-2.6.git

diff --git a/arch/arm/mach-vexpress/include/mach/debug-macro.S b/arch/arm/mach-vexpress/include/mach/debug-macro.S
index 5167e2aceeb..050d65e02a4 100644
--- a/arch/arm/mach-vexpress/include/mach/debug-macro.S
+++ b/arch/arm/mach-vexpress/include/mach/debug-macro.S
@@ -12,12 +12,10 @@
 
 #define DEBUG_LL_UART_OFFSET	0x00009000
 
-		.macro	addruart,rx,tmp
-		mrc	p15, 0, \rx, c1, c0
-		tst	\rx, #1			@ MMU enabled?
-		moveq	\rx,      #0x10000000
-		movne	\rx,      #0xf8000000	@ virtual base
-		orr	\rx, \rx, #DEBUG_LL_UART_OFFSET
+		.macro	addruart,rp,rv
+		mov	\rp, #DEBUG_LL_UART_OFFSET
+		orr	\rv, \rp, #0xf8000000	@ virtual base
+		orr	\rp, \rp, #0x10000000	@ physical base
 		.endm
 
 #include <asm/hardware/debug-pl01x.S>