diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-23 14:42:30 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-23 14:42:30 +0100 |
| commit | 34471a9168c8bfd7f0d00989a7b0797ad27d585e (patch) | |
| tree | 847af3ec746c6357902cf57c7e12ba55a35eed30 /arch/arm/include/asm/entry-macro-multi.S | |
| parent | cefd3e71efca6f4ef7f06f1fc507771d76072741 (diff) | |
| parent | 28af690a284dfcb627bd69d0963db1c0f412cb8c (diff) | |
| download | linux-3.10-34471a9168c8bfd7f0d00989a7b0797ad27d585e.tar.gz linux-3.10-34471a9168c8bfd7f0d00989a7b0797ad27d585e.tar.bz2 linux-3.10-34471a9168c8bfd7f0d00989a7b0797ad27d585e.zip | |
Merge branch 'ppi-irq-core-for-rmk' of git://github.com/mzyngier/arm-platforms into devel-stable
Diffstat (limited to 'arch/arm/include/asm/entry-macro-multi.S')
| -rw-r--r-- | arch/arm/include/asm/entry-macro-multi.S | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/include/asm/entry-macro-multi.S b/arch/arm/include/asm/entry-macro-multi.S index 2f1e2098dfe..88d61815f0c 100644 --- 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 |