diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-02-20 11:52:01 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-20 11:52:43 +0100 |
| commit | e80a0e6e7ccdf64575d4384cb4172860422f5b81 (patch) | |
| tree | 8960fa71eb73d0f1185e893192411cb873362738 /arch/arm/kernel/entry-armv.S | |
| parent | Merge the easy part of the IOP branch (diff) | |
| parent | [ARM] 4187/1: iop: unify time implementation across iop32x, iop33x, and iop13xx (diff) | |
| download | linux-e80a0e6e7ccdf64575d4384cb4172860422f5b81.tar.xz linux-e80a0e6e7ccdf64575d4384cb4172860422f5b81.zip | |
[ARM] Merge remaining IOP code
Conflicts:
include/asm-arm/arch-at91rm9200/entry-macro.S
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/entry-armv.S')
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index cc10a093a545..d645897652c2 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -27,6 +27,7 @@ * Interrupt handling. Preserves r7, r8, r9 */ .macro irq_handler + get_irqnr_preamble r5, lr 1: get_irqnr_and_base r0, r6, r5, lr movne r1, sp @ |