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

Commit a918feef authored by Marc Zyngier's avatar Marc Zyngier Committed by Shawn Guo
Browse files

ARM: mxc: fix local timer interrupt handling 



As local timer interrupts are now handled as normal interrupts,
remove the special case in the GIC handler.

Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Sascha Hauer <kernel@pengutronix.de>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Tested-and-Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent 70c9f18c

arch/arm/plat-mxc/gic.c

+2 −9
Original line number Diff line number Diff line
@@ -28,21 +28,14 @@ asmlinkage void __exception_irq_entry gic_handle_irq(struct pt_regs *regs) 
		if (irqnr == 1023)

			break;



		if (irqnr > 29 && irqnr < 1021)

		if (irqnr > 15 && irqnr < 1021)

			handle_IRQ(irqnr, regs);

#ifdef CONFIG_SMP

		else if (irqnr < 16) {

		else {

			writel_relaxed(irqstat, gic_cpu_base_addr +

						GIC_CPU_EOI);

			handle_IPI(irqnr, regs);

		}

#endif

#ifdef CONFIG_LOCAL_TIMERS

		else if (irqnr == 29) {

			writel_relaxed(irqstat, gic_cpu_base_addr +

						GIC_CPU_EOI);

			handle_local_timer(regs);

		}

#endif

	} while (1);

}