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 branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
[pandora-kernel.git]
/
arch
/
arm
/
include
/
asm
/
entry-macro-multi.S
diff --git
a/arch/arm/include/asm/entry-macro-multi.S
b/arch/arm/include/asm/entry-macro-multi.S
index
2f1e209
..
88d6181
100644
(file)
--- a/
arch/arm/include/asm/entry-macro-multi.S
+++ b/
arch/arm/include/asm/entry-macro-multi.S
@@
-25,13
+25,6
@@
movne r1, sp
adrne lr, BSYM(1b)
bne do_IPI
-
-#ifdef CONFIG_LOCAL_TIMERS
- test_for_ltirq r0, r2, r6, lr
- movne r0, sp
- adrne lr, BSYM(1b)
- bne do_local_timer
-#endif
#endif
9997:
.endm