diff options
| author | John David Anglin <dave@hiauly1.hia.nrc.ca> | 2011-06-12 03:46:41 +0200 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2013-01-07 23:06:23 +0100 |
| commit | cac1f12b9f7409510a5abcf3eaecc2c56b75242a (patch) | |
| tree | f6c082f5ae3673e30b4a07c1e4c469d02477644d /arch/parisc/kernel/irq.c | |
| parent | parisc: avoid undefined shift in cnv_float.h (diff) | |
| download | linux-cac1f12b9f7409510a5abcf3eaecc2c56b75242a.tar.xz linux-cac1f12b9f7409510a5abcf3eaecc2c56b75242a.zip | |
parisc: don't claim cpu irqs more than once
The CPU irqs (timer and IPI) are not shared and only need to be claimed once.
A mismatch error occurs if they are claimed more than once.
Signed-off-by: John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Helge Deller <deller@gmx.de>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to 'arch/parisc/kernel/irq.c')
| -rw-r--r-- | arch/parisc/kernel/irq.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c index c0b1affc06a8..0299d63cd112 100644 --- a/arch/parisc/kernel/irq.c +++ b/arch/parisc/kernel/irq.c @@ -410,11 +410,13 @@ void __init init_IRQ(void) { local_irq_disable(); /* PARANOID - should already be disabled */ mtctl(~0UL, 23); /* EIRR : clear all pending external intr */ - claim_cpu_irqs(); #ifdef CONFIG_SMP - if (!cpu_eiem) + if (!cpu_eiem) { + claim_cpu_irqs(); cpu_eiem = EIEM_MASK(IPI_IRQ) | EIEM_MASK(TIMER_IRQ); + } #else + claim_cpu_irqs(); cpu_eiem = EIEM_MASK(TIMER_IRQ); #endif set_eiem(cpu_eiem); /* EIEM : enable all external intr */ |