diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /arch/arm/kernel/debug.S | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'arch/arm/kernel/debug.S')
| -rw-r--r-- | arch/arm/kernel/debug.S | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S index d2d983be096d..bcd66e00bdbe 100644 --- a/arch/arm/kernel/debug.S +++ b/arch/arm/kernel/debug.S | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | .macro addruart, rp, rv | 25 | .macro addruart, rp, rv |
| 26 | .endm | 26 | .endm |
| 27 | 27 | ||
| 28 | #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) | 28 | #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) || defined(CONFIG_CPU_V7) |
| 29 | 29 | ||
| 30 | .macro senduart, rd, rx | 30 | .macro senduart, rd, rx |
| 31 | mcr p14, 0, \rd, c0, c5, 0 | 31 | mcr p14, 0, \rd, c0, c5, 0 |
| @@ -49,23 +49,6 @@ | |||
| 49 | 1002: | 49 | 1002: |
| 50 | .endm | 50 | .endm |
| 51 | 51 | ||
| 52 | #elif defined(CONFIG_CPU_V7) | ||
| 53 | |||
| 54 | .macro senduart, rd, rx | ||
| 55 | mcr p14, 0, \rd, c0, c5, 0 | ||
| 56 | .endm | ||
| 57 | |||
| 58 | .macro busyuart, rd, rx | ||
| 59 | busy: mrc p14, 0, pc, c0, c1, 0 | ||
| 60 | bcs busy | ||
| 61 | .endm | ||
| 62 | |||
| 63 | .macro waituart, rd, rx | ||
| 64 | wait: mrc p14, 0, pc, c0, c1, 0 | ||
| 65 | bcs wait | ||
| 66 | |||
| 67 | .endm | ||
| 68 | |||
| 69 | #elif defined(CONFIG_CPU_XSCALE) | 52 | #elif defined(CONFIG_CPU_XSCALE) |
| 70 | 53 | ||
| 71 | .macro senduart, rd, rx | 54 | .macro senduart, rd, rx |