summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2014-08-26 06:03:17 -0400
committerJason Cooper <jason@lakedaemon.net>2014-09-03 08:58:13 -0400
commita1ddc74a23c89ae236b163a3b0887f8c344aaa4a (patch)
treef136142a729771bb77d227cb8f5f6a94c9a1ba77 /arch
parent76ba59f8366f2d9282cb5bda9de75b4b68cbe55f (diff)
arm64: Convert handle_IRQ to use __handle_domain_irq
In order to limit code duplication, convert the architecture specific handle_IRQ to use the generic __handle_domain_irq function. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Link: https://lkml.kernel.org/r/1409047421-27649-3-git-send-email-marc.zyngier@arm.com Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/Kconfig1
-rw-r--r--arch/arm64/kernel/irq.c18
2 files changed, 2 insertions, 17 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index fd4e81a4e1ce..1f16ed96f3f6 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -30,6 +30,7 @@ config ARM64
30 select GENERIC_STRNCPY_FROM_USER 30 select GENERIC_STRNCPY_FROM_USER
31 select GENERIC_STRNLEN_USER 31 select GENERIC_STRNLEN_USER
32 select GENERIC_TIME_VSYSCALL 32 select GENERIC_TIME_VSYSCALL
33 select HANDLE_DOMAIN_IRQ
33 select HARDIRQS_SW_RESEND 34 select HARDIRQS_SW_RESEND
34 select HAVE_ARCH_AUDITSYSCALL 35 select HAVE_ARCH_AUDITSYSCALL
35 select HAVE_ARCH_JUMP_LABEL 36 select HAVE_ARCH_JUMP_LABEL
diff --git a/arch/arm64/kernel/irq.c b/arch/arm64/kernel/irq.c
index 0f08dfd69ebc..2c0e2a744723 100644
--- a/arch/arm64/kernel/irq.c
+++ b/arch/arm64/kernel/irq.c
@@ -48,23 +48,7 @@ int arch_show_interrupts(struct seq_file *p, int prec)
48 */ 48 */
49void handle_IRQ(unsigned int irq, struct pt_regs *regs) 49void handle_IRQ(unsigned int irq, struct pt_regs *regs)
50{ 50{
51 struct pt_regs *old_regs = set_irq_regs(regs); 51 __handle_domain_irq(NULL, irq, false, regs);
52
53 irq_enter();
54
55 /*
56 * Some hardware gives randomly wrong interrupts. Rather
57 * than crashing, do something sensible.
58 */
59 if (unlikely(irq >= nr_irqs)) {
60 pr_warn_ratelimited("Bad IRQ%u\n", irq);
61 ack_bad_irq(irq);
62 } else {
63 generic_handle_irq(irq);
64 }
65
66 irq_exit();
67 set_irq_regs(old_regs);
68} 52}
69 53
70void __init set_handle_irq(void (*handle_irq)(struct pt_regs *)) 54void __init set_handle_irq(void (*handle_irq)(struct pt_regs *))