diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:11:46 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 19:25:01 -0400 |
| commit | 5725aeae5ff2e39f3815bbef788ee326c9afea2c (patch) | |
| tree | 4f32f936ba18384d48ab1e537b787a8ce666263f /arch/arm/kernel/debug.S | |
| parent | 43872fa788060eef91ae437957e0a5e39f1c56fd (diff) | |
| parent | 0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff) | |
Merge branch 'depends/rmk/memory_h' into next/fixes
Fix up all conflicts between the memory.h cleanup and bug fixes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/kernel/debug.S')
| -rw-r--r-- | arch/arm/kernel/debug.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S index bcd66e00bdbe..b7685f1bb04a 100644 --- a/arch/arm/kernel/debug.S +++ b/arch/arm/kernel/debug.S | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #if defined(CONFIG_DEBUG_ICEDCC) | 22 | #if defined(CONFIG_DEBUG_ICEDCC) |
| 23 | @@ debug using ARM EmbeddedICE DCC channel | 23 | @@ debug using ARM EmbeddedICE DCC channel |
| 24 | 24 | ||
| 25 | .macro addruart, rp, rv | 25 | .macro addruart, rp, rv, tmp |
| 26 | .endm | 26 | .endm |
| 27 | 27 | ||
| 28 | #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) || defined(CONFIG_CPU_V7) | 28 | #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) || defined(CONFIG_CPU_V7) |
| @@ -106,7 +106,7 @@ | |||
| 106 | 106 | ||
| 107 | #ifdef CONFIG_MMU | 107 | #ifdef CONFIG_MMU |
| 108 | .macro addruart_current, rx, tmp1, tmp2 | 108 | .macro addruart_current, rx, tmp1, tmp2 |
| 109 | addruart \tmp1, \tmp2 | 109 | addruart \tmp1, \tmp2, \rx |
| 110 | mrc p15, 0, \rx, c1, c0 | 110 | mrc p15, 0, \rx, c1, c0 |
| 111 | tst \rx, #1 | 111 | tst \rx, #1 |
| 112 | moveq \rx, \tmp1 | 112 | moveq \rx, \tmp1 |