diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-19 12:13:58 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-19 12:13:58 +0100 |
| commit | e087a412b45543a87497f0a213dbd5d55099f267 (patch) | |
| tree | 8892cc84dbee2b4387c9f2604a7892b6ef3aab25 /include/asm-arm/arch-ixp4xx/entry-macro.S | |
| parent | 7946ada30bc45546cefc85809ba0fd07879eff52 (diff) | |
| parent | bb7e257ef8d8ba43cab356aa1cc1b20d0106d45f (diff) | |
| download | talos-op-linux-e087a412b45543a87497f0a213dbd5d55099f267.tar.gz talos-op-linux-e087a412b45543a87497f0a213dbd5d55099f267.zip | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'include/asm-arm/arch-ixp4xx/entry-macro.S')
| -rw-r--r-- | include/asm-arm/arch-ixp4xx/entry-macro.S | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/asm-arm/arch-ixp4xx/entry-macro.S b/include/asm-arm/arch-ixp4xx/entry-macro.S index 455da64832de..323b0bc4a39c 100644 --- a/include/asm-arm/arch-ixp4xx/entry-macro.S +++ b/include/asm-arm/arch-ixp4xx/entry-macro.S @@ -15,25 +15,26 @@ ldr \irqstat, =(IXP4XX_INTC_BASE_VIRT+IXP4XX_ICIP_OFFSET) ldr \irqstat, [\irqstat] @ get interrupts cmp \irqstat, #0 - beq 1001f + beq 1001f @ upper IRQ? clz \irqnr, \irqstat mov \base, #31 - subs \irqnr, \base, \irqnr + sub \irqnr, \base, \irqnr + b 1002f @ lower IRQ being + @ handled 1001: /* * IXP465 has an upper IRQ status register */ #if defined(CONFIG_CPU_IXP46X) - bne 1002f ldr \irqstat, =(IXP4XX_INTC_BASE_VIRT+IXP4XX_ICIP2_OFFSET) ldr \irqstat, [\irqstat] @ get upper interrupts mov \irqnr, #63 clz \irqstat, \irqstat cmp \irqstat, #32 subne \irqnr, \irqnr, \irqstat -1002: #endif +1002: .endm |
