diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2013-05-08 13:22:07 +0400 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2013-05-08 13:22:07 +0400 |
| commit | e6b6dc7f35f9bf91b1e4ef14e5112948910b8875 (patch) | |
| tree | df60971e6b7049bc3ca2d1229b89c300fe8cf107 /arch/arm/include/asm/irq.h | |
| parent | 16c85a1fd73eade2ae290d759924c09b4595f504 (diff) | |
| parent | c0114709ed85a5693eb74acdfa03d94f7f12e5b8 (diff) | |
| download | linux-e6b6dc7f35f9bf91b1e4ef14e5112948910b8875.tar.xz | |
Merge branch 'gic' into HEAD
* arm64-prep-gic:
irqchip: gic: Perform the gic_secondary_init() call via CPU notifier
irqchip: gic: Call handle_bad_irq() directly
arm: Move chained_irq_(enter|exit) to a generic file
arm: Move the set_handle_irq and handle_arch_irq declarations to asm/irq.h
Diffstat (limited to 'arch/arm/include/asm/irq.h')
| -rw-r--r-- | arch/arm/include/asm/irq.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/include/asm/irq.h b/arch/arm/include/asm/irq.h index 35c21c375d81..53c15dec7af6 100644 --- a/arch/arm/include/asm/irq.h +++ b/arch/arm/include/asm/irq.h @@ -30,6 +30,11 @@ extern void asm_do_IRQ(unsigned int, struct pt_regs *); void handle_IRQ(unsigned int, struct pt_regs *); void init_IRQ(void); +#ifdef CONFIG_MULTI_IRQ_HANDLER +extern void (*handle_arch_irq)(struct pt_regs *); +extern void set_handle_irq(void (*handle_irq)(struct pt_regs *)); +#endif + #endif #endif |