Merge to Fedora kernel-2.6.7-1.441

[linux-2.6.git] / arch / arm / kernel / debug.S

diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S
index 2ae6eae..22b7836 100644 (file)
--- a/arch/arm/kernel/debug.S
+++ b/arch/arm/kernel/debug.S
@@ -591,7 +591,8 @@
                .macro  addruart,rx
                mrc     p15, 0, \rx, c1, c0
                tst     \rx, #1                 @ MMU enabled?
-               ldr     \rx, =0x80000700        @ physical base address
+               mov     \rx, #0x00000700        @ offset from base
+               orreq   \rx, \rx, #0x80000000   @ physical base
                orrne   \rx, \rx, #0xf8000000   @ virtual base
                .endm