diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2005-11-05 18:54:22 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 02:36:25 +0100 |
| commit | 9d2ba6faa1c2e10546a4bdf0f9687436d7681b2f (patch) | |
| tree | 47d6fd707ea6b378eb8e0c07343e1f3e94a794bf /arch/powerpc/sysdev | |
| parent | [PATCH] dlpar enable for OF pci probe (diff) | |
| download | linux-9d2ba6faa1c2e10546a4bdf0f9687436d7681b2f.tar.xz linux-9d2ba6faa1c2e10546a4bdf0f9687436d7681b2f.zip | |
[PATCH] powerpc: Fix i8259 cascade IRQ
setup_irq() aborts immediately if there's no handler for the IRQ in
question. So i8259_init() should set up its handlers before trying to
set up the cascade on IRQ 2.
With this and the patch I sent a few days ago to fix initrd on ppc32, my
Pegasos now runs the arch/powerpc kernel.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/sysdev')
| -rw-r--r-- | arch/powerpc/sysdev/i8259.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/i8259.c b/arch/powerpc/sysdev/i8259.c index 90bce6e0c191..b7ac32fdd776 100644 --- a/arch/powerpc/sysdev/i8259.c +++ b/arch/powerpc/sysdev/i8259.c @@ -207,6 +207,9 @@ void __init i8259_init(unsigned long intack_addr, int offset) spin_unlock_irqrestore(&i8259_lock, flags); + for (i = 0; i < NUM_ISA_INTERRUPTS; ++i) + irq_desc[offset + i].handler = &i8259_pic; + /* reserve our resources */ setup_irq(offset + 2, &i8259_irqaction); request_resource(&ioport_resource, &pic1_iores); @@ -216,6 +219,4 @@ void __init i8259_init(unsigned long intack_addr, int offset) if (intack_addr != 0) pci_intack = ioremap(intack_addr, 1); - for (i = 0; i < NUM_ISA_INTERRUPTS; ++i) - irq_desc[offset + i].handler = &i8259_pic; } |