diff options
| author | Roderick Colenbrander <thunderbird2k@gmail.com> | 2009-09-03 17:57:23 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-05 23:58:07 +0200 |
| commit | 74a01180db4bbfd61304ae0ba1f60af55ffc803d (patch) | |
| tree | 2f61aac8deb306a164f04a7d2753fbd723c906fc | |
| parent | Merge git://git.infradead.org/~dwmw2/mtd-2.6.31 (diff) | |
| download | linux-74a01180db4bbfd61304ae0ba1f60af55ffc803d.tar.xz linux-74a01180db4bbfd61304ae0ba1f60af55ffc803d.zip | |
powerpc: Fix i8259 interrupt driver kernel crash on ML510
This patch fixes a null pointer exception caused by removal of
'ack()' for level interrupts in the Xilinx interrupt driver. A recent
change to the xilinx interrupt controller removed the ack hook for
level irqs.
Signed-off-by: Roderick Colenbrander <thunderbird2k@gmail.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/powerpc/sysdev/xilinx_intc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/xilinx_intc.c b/arch/powerpc/sysdev/xilinx_intc.c index 3ee1fd37bbfc..40edad520770 100644 --- a/arch/powerpc/sysdev/xilinx_intc.c +++ b/arch/powerpc/sysdev/xilinx_intc.c @@ -234,7 +234,6 @@ static void xilinx_i8259_cascade(unsigned int irq, struct irq_desc *desc) generic_handle_irq(cascade_irq); /* Let xilinx_intc end the interrupt */ - desc->chip->ack(irq); desc->chip->unmask(irq); } |