vserver 2.0 rc7

[linux-2.6.git] / include / asm-arm / arch-ebsa285 / debug-macro.S

diff --git a/include/asm-arm/arch-ebsa285/debug-macro.S b/include/asm-arm/arch-ebsa285/debug-macro.S
index 237853d..97d15fc 100644 (file)
--- a/include/asm-arm/arch-ebsa285/debug-macro.S
+++ b/include/asm-arm/arch-ebsa285/debug-macro.S
@@ -45,9 +45,12 @@
                .equ    dc21285_low,  ARMCSR_BASE & 0x00ffffff
 
                .macro  addruart,rx
-               mov     \rx, #dc21285_high
+               mrc     p15, 0, \rx, c1, c0
+               tst     \rx, #1                 @ MMU enabled?
+               moveq   \rx, #0x42000000
+               movne   \rx, #dc21285_high
                .if     dc21285_low
-               orr     \rx, \rx, #dc21285_low
+               orrne   \rx, \rx, #dc21285_low
                .endif
                .endm