diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-17 17:47:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-17 17:47:24 -0400 |
| commit | a4e884a311893b476893739901bed382cd62b4fe (patch) | |
| tree | 7b7b52678b61dfdf8e3a16b0e920d1e9b0cae979 /include/asm-arm/arch-ebsa285/debug-macro.S | |
| parent | ce1dc02f76432a46db149241e015a4f782974623 (diff) | |
| parent | cc56449f53ba45646c6f0a2edf77c4acb342caed (diff) | |
Merge with master.kernel.org:/home/rmk/linux-2.6-rmk.git - ARM changes
First ever true git merge. Let's see if it actually works.
Diffstat (limited to 'include/asm-arm/arch-ebsa285/debug-macro.S')
| -rw-r--r-- | include/asm-arm/arch-ebsa285/debug-macro.S | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/asm-arm/arch-ebsa285/debug-macro.S b/include/asm-arm/arch-ebsa285/debug-macro.S index 237853db6e2f..97d15fc629af 100644 --- a/include/asm-arm/arch-ebsa285/debug-macro.S +++ b/include/asm-arm/arch-ebsa285/debug-macro.S | |||
| @@ -45,9 +45,12 @@ | |||
| 45 | .equ dc21285_low, ARMCSR_BASE & 0x00ffffff | 45 | .equ dc21285_low, ARMCSR_BASE & 0x00ffffff |
| 46 | 46 | ||
| 47 | .macro addruart,rx | 47 | .macro addruart,rx |
| 48 | mov \rx, #dc21285_high | 48 | mrc p15, 0, \rx, c1, c0 |
| 49 | tst \rx, #1 @ MMU enabled? | ||
| 50 | moveq \rx, #0x42000000 | ||
| 51 | movne \rx, #dc21285_high | ||
| 49 | .if dc21285_low | 52 | .if dc21285_low |
| 50 | orr \rx, \rx, #dc21285_low | 53 | orrne \rx, \rx, #dc21285_low |
| 51 | .endif | 54 | .endif |
| 52 | .endm | 55 | .endm |
| 53 | 56 | ||