diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 23:58:06 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 00:11:41 +0100 |
| commit | a7fadac10ffbfd16cc7ccf951eab1ecf85e1abdf (patch) | |
| tree | 64a1035b02cb8aae34b96fc7c1c7caaad337ac07 /arch/arm/kernel/debug.S | |
| parent | 335332770c68649ffeaf5dc2b58d9cd40041e295 (diff) | |
| parent | 531a6a941745e1e045dd2a6bd09e1dc01247a5f3 (diff) | |
Merge branch 'depends/rmk/devel-stable' into next/board
The exynos4 updates conflict with code from the arm devel-stable branch
and new boards need to set atag_offset in place of boot_param.
Conflicts:
arch/arm/Kconfig
arch/arm/mach-exynos4/include/mach/entry-macro.S
arch/arm/mach-exynos4/mach-smdkc210.c
arch/arm/mach-exynos4/mach-smdkv310.c
arch/arm/mach-exynos4/mct.c
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 @@ #if defined(CONFIG_DEBUG_ICEDCC) @@ debug using ARM EmbeddedICE DCC channel - .macro addruart, rp, rv + .macro addruart, rp, rv, tmp .endm #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) || defined(CONFIG_CPU_V7) @@ -106,7 +106,7 @@ #ifdef CONFIG_MMU .macro addruart_current, rx, tmp1, tmp2 - addruart \tmp1, \tmp2 + addruart \tmp1, \tmp2, \rx mrc p15, 0, \rx, c1, c0 tst \rx, #1 moveq \rx, \tmp1 |