diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:23:44 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:23:44 +0100 |
commit | 94314a40bcc537c396012e37cf887572f0d82aef (patch) | |
tree | 489b42e181317730713f8800ac2889039b0faae3 /arch/arm/mach-exynos4/include/mach | |
parent | 929f58aeeb46f964d9468ce1addd993f5d92b11d (diff) | |
parent | f37a53cc5d8a8fb199e41386d125d8c2ed9e54ef (diff) | |
download | blackbird-op-linux-94314a40bcc537c396012e37cf887572f0d82aef.tar.gz blackbird-op-linux-94314a40bcc537c396012e37cf887572f0d82aef.zip |
Merge branch 'dt/gic' into imx/imx6q
Diffstat (limited to 'arch/arm/mach-exynos4/include/mach')
-rw-r--r-- | arch/arm/mach-exynos4/include/mach/debug-macro.S | 2 | ||||
-rw-r--r-- | arch/arm/mach-exynos4/include/mach/entry-macro.S | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/mach-exynos4/include/mach/debug-macro.S b/arch/arm/mach-exynos4/include/mach/debug-macro.S index a442ef861167..6cacf16a67a6 100644 --- a/arch/arm/mach-exynos4/include/mach/debug-macro.S +++ b/arch/arm/mach-exynos4/include/mach/debug-macro.S @@ -20,7 +20,7 @@ * aligned and add in the offset when we load the value here. */ - .macro addruart, rp, rv + .macro addruart, rp, rv, tmp ldr \rp, = S3C_PA_UART ldr \rv, = S3C_VA_UART #if CONFIG_DEBUG_S3C_UART != 0 diff --git a/arch/arm/mach-exynos4/include/mach/entry-macro.S b/arch/arm/mach-exynos4/include/mach/entry-macro.S index d7a1e281ce7a..006a4f4c65c6 100644 --- a/arch/arm/mach-exynos4/include/mach/entry-macro.S +++ b/arch/arm/mach-exynos4/include/mach/entry-macro.S @@ -55,7 +55,7 @@ bic \irqnr, \irqstat, #0x1c00 - cmp \irqnr, #29 + cmp \irqnr, #15 cmpcc \irqnr, \irqnr cmpne \irqnr, \tmp cmpcs \irqnr, \irqnr @@ -76,8 +76,3 @@ strcc \irqstat, [\base, #GIC_CPU_EOI] cmpcs \irqnr, \irqnr .endm - - /* As above, this assumes that irqstat and base are preserved.. */ - - .macro test_for_ltirq, irqnr, irqstat, base, tmp - .endm |