summaryrefslogtreecommitdiff
path: root/arch/arm/kernel/debug.S
diff options
context:
space:
mode:
authorDeepak Saxena <dsaxena@plexity.net>2004-06-17 06:05:11 -0700
committerDeepak Saxena <dsaxena@omelas.(none)>2004-06-17 06:05:11 -0700
commitfffb8b5155f0e2e83b409859d0235806eef71e5f (patch)
treeec0fe1faf17bbcb41d4ca8f5b54d20af53d16a5f /arch/arm/kernel/debug.S
parentf0b3c84e7da94fd7a174bba885d3bb26090683f5 (diff)
parent01c0a4a6e520eb5a9fffd7730f885ef1281cd3c9 (diff)
Merge plexity.net:/home/dsaxena/src/linux-2.6-arm-timer
into plexity.net:/home/dsaxena/src/linux-2.6-for-rmk
Diffstat (limited to 'arch/arm/kernel/debug.S')
-rw-r--r--arch/arm/kernel/debug.S3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S
index 0b3b9ab5b41d..822dbde5af8c 100644
--- a/arch/arm/kernel/debug.S
+++ b/arch/arm/kernel/debug.S
@@ -565,7 +565,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