diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2014-08-26 06:03:18 -0400 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-09-03 08:58:36 -0400 |
| commit | a71b092a9c68685a270ebdde7b5986ba8787e575 (patch) | |
| tree | 2a8ff7d41e15788bfb89b6c2d8a28aefedb6c972 | |
| parent | a1ddc74a23c89ae236b163a3b0887f8c344aaa4a (diff) | |
ARM: 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>
Link: https://lkml.kernel.org/r/1409047421-27649-4-git-send-email-marc.zyngier@arm.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| -rw-r--r-- | arch/arm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/kernel/irq.c | 19 |
2 files changed, 2 insertions, 18 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index c49a775937db..5918d40bb12e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -24,6 +24,7 @@ config ARM | |||
| 24 | select GENERIC_SMP_IDLE_THREAD | 24 | select GENERIC_SMP_IDLE_THREAD |
| 25 | select GENERIC_STRNCPY_FROM_USER | 25 | select GENERIC_STRNCPY_FROM_USER |
| 26 | select GENERIC_STRNLEN_USER | 26 | select GENERIC_STRNLEN_USER |
| 27 | select HANDLE_DOMAIN_IRQ | ||
| 27 | select HARDIRQS_SW_RESEND | 28 | select HARDIRQS_SW_RESEND |
| 28 | select HAVE_ARCH_AUDITSYSCALL if (AEABI && !OABI_COMPAT) | 29 | select HAVE_ARCH_AUDITSYSCALL if (AEABI && !OABI_COMPAT) |
| 29 | select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL | 30 | select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL |
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c index 2c4257604513..0509d07c96ab 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c | |||
| @@ -65,24 +65,7 @@ int arch_show_interrupts(struct seq_file *p, int prec) | |||
| 65 | */ | 65 | */ |
| 66 | void handle_IRQ(unsigned int irq, struct pt_regs *regs) | 66 | void handle_IRQ(unsigned int irq, struct pt_regs *regs) |
| 67 | { | 67 | { |
| 68 | struct pt_regs *old_regs = set_irq_regs(regs); | 68 | __handle_domain_irq(NULL, irq, false, regs); |
| 69 | |||
| 70 | irq_enter(); | ||
| 71 | |||
| 72 | /* | ||
| 73 | * Some hardware gives randomly wrong interrupts. Rather | ||
| 74 | * than crashing, do something sensible. | ||
| 75 | */ | ||
| 76 | if (unlikely(irq >= nr_irqs)) { | ||
| 77 | if (printk_ratelimit()) | ||
| 78 | printk(KERN_WARNING "Bad IRQ%u\n", irq); | ||
| 79 | ack_bad_irq(irq); | ||
| 80 | } else { | ||
| 81 | generic_handle_irq(irq); | ||
| 82 | } | ||
| 83 | |||
| 84 | irq_exit(); | ||
| 85 | set_irq_regs(old_regs); | ||
| 86 | } | 69 | } |
| 87 | 70 | ||
| 88 | /* | 71 | /* |
