diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-12 10:02:59 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-12 10:02:59 +0900 |
| commit | 1006fae359cc810c16354805c0cffbb6ffee602e (patch) | |
| tree | bd69f7a235f679a8336b237ed9722bb7f64db39a /arch/arm/mach-bcm2835/bcm2835.c | |
| parent | 70fdcb83db15c85a0495b07dc55d9347a4c2efd9 (diff) | |
| parent | 5702941eec32cfd7b8cf9e36a0936e48170011a4 (diff) | |
| download | talos-obmc-linux-1006fae359cc810c16354805c0cffbb6ffee602e.tar.gz talos-obmc-linux-1006fae359cc810c16354805c0cffbb6ffee602e.zip | |
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull IRQ changes from Ingo Molnar:
"The biggest change this cycle are the softirq/hardirq stack
interaction and nesting fixes, cleanups and reorganizations from
Frederic. This is the longer followup story to the softirq nesting
fix that is already upstream (commit ded797547548: "irq: Force hardirq
exit's softirq processing on its own stack")"
* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip: bcm2835: Convert to use IRQCHIP_DECLARE macro
powerpc: Tell about irq stack coverage
x86: Tell about irq stack coverage
irq: Optimize softirq stack selection in irq exit
irq: Justify the various softirq stack choices
irq: Improve a bit softirq debugging
irq: Optimize call to softirq on hardirq exit
irq: Consolidate do_softirq() arch overriden implementations
x86/irq: Correct comment about i8259 initialization
Diffstat (limited to 'arch/arm/mach-bcm2835/bcm2835.c')
| -rw-r--r-- | arch/arm/mach-bcm2835/bcm2835.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-bcm2835/bcm2835.c b/arch/arm/mach-bcm2835/bcm2835.c index d50135be0c20..70f2f3925f0e 100644 --- a/arch/arm/mach-bcm2835/bcm2835.c +++ b/arch/arm/mach-bcm2835/bcm2835.c @@ -14,7 +14,7 @@ #include <linux/delay.h> #include <linux/init.h> -#include <linux/irqchip/bcm2835.h> +#include <linux/irqchip.h> #include <linux/of_address.h> #include <linux/of_platform.h> #include <linux/clk/bcm2835.h> @@ -130,8 +130,7 @@ static const char * const bcm2835_compat[] = { DT_MACHINE_START(BCM2835, "BCM2835") .map_io = bcm2835_map_io, - .init_irq = bcm2835_init_irq, - .handle_irq = bcm2835_handle_irq, + .init_irq = irqchip_init, .init_machine = bcm2835_init, .restart = bcm2835_restart, .dt_compat = bcm2835_compat |
