Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cac1f12b authored by John David Anglin's avatar John David Anglin Committed by Helge Deller
Browse files

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: default avatarJohn 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: default avatarHelge Deller <deller@gmx.de>
parent cabd91c3

arch/parisc/kernel/irq.c

+4 −2
Original line number Diff line number Diff line
@@ -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 */