git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
[pandora-kernel.git]
/
arch
/
arm
/
mach-exynos4
/
include
/
mach
/
entry-macro.S
diff --git
a/arch/arm/mach-exynos4/include/mach/entry-macro.S
b/arch/arm/mach-exynos4/include/mach/entry-macro.S
index
d8f38c2
..
d7a1e28
100644
(file)
--- a/
arch/arm/mach-exynos4/include/mach/entry-macro.S
+++ b/
arch/arm/mach-exynos4/include/mach/entry-macro.S
@@
-10,6
+10,7
@@
*/
#include <mach/hardware.h>
*/
#include <mach/hardware.h>
+#include <mach/map.h>
#include <asm/hardware/gic.h>
.macro disable_fiq
#include <asm/hardware/gic.h>
.macro disable_fiq
@@
-18,6
+19,10
@@
.macro get_irqnr_preamble, base, tmp
ldr \base, =gic_cpu_base_addr
ldr \base, [\base]
.macro get_irqnr_preamble, base, tmp
ldr \base, =gic_cpu_base_addr
ldr \base, [\base]
+ mrc p15, 0, \tmp, c0, c0, 5
+ and \tmp, \tmp, #3
+ cmp \tmp, #1
+ addeq \base, \base, #EXYNOS4_GIC_BANK_OFFSET
.endm
.macro arch_ret_to_user, tmp1, tmp2
.endm
.macro arch_ret_to_user, tmp1, tmp2
@@
-75,10
+80,4
@@
/* As above, this assumes that irqstat and base are preserved.. */
.macro test_for_ltirq, irqnr, irqstat, base, tmp
/* As above, this assumes that irqstat and base are preserved.. */
.macro test_for_ltirq, irqnr, irqstat, base, tmp
- bic \irqnr, \irqstat, #0x1c00
- mov \tmp, #0
- cmp \irqnr, #29
- moveq \tmp, #1
- streq \irqstat, [\base, #GIC_CPU_EOI]
- cmp \tmp, #0
.endm
.endm