aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/irq_32.c
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2009-02-06 17:09:41 -0500
committerIngo Molnar <mingo@elte.hu>2009-02-09 06:16:05 -0500
commit7c1d7cdcef1b54f4a78892b6b99d19f12c4f398e (patch)
treeb682c8a8d4ee0cf00de2ee6d00cd8fea37ad6339 /arch/x86/kernel/irq_32.c
parent9b2b76a3344146c4d8d300874e73af8161204f87 (diff)
x86: unify do_IRQ()
With the differences in interrupt handling hoisted into handle_irq(), do_IRQ is more or less identical between 32 and 64 bit, so unify it. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/irq_32.c')
-rw-r--r--arch/x86/kernel/irq_32.c27
1 files changed, 0 insertions, 27 deletions
diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
index 61f09fb969ee..4beb9a13873d 100644
--- a/arch/x86/kernel/irq_32.c
+++ b/arch/x86/kernel/irq_32.c
@@ -211,33 +211,6 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
211 return true; 211 return true;
212} 212}
213 213
214/*
215 * do_IRQ handles all normal device IRQ's (the special
216 * SMP cross-CPU interrupts have their own specific
217 * handlers).
218 */
219unsigned int do_IRQ(struct pt_regs *regs)
220{
221 struct pt_regs *old_regs;
222 /* high bit used in ret_from_ code */
223 unsigned vector = ~regs->orig_ax;
224 unsigned irq;
225
226 old_regs = set_irq_regs(regs);
227 irq_enter();
228 irq = __get_cpu_var(vector_irq)[vector];
229
230 if (!handle_irq(irq, regs)) {
231 printk(KERN_EMERG "%s: cannot handle IRQ %d vector %#x cpu %d\n",
232 __func__, irq, vector, smp_processor_id());
233 BUG();
234 }
235
236 irq_exit();
237 set_irq_regs(old_regs);
238 return 1;
239}
240
241#ifdef CONFIG_HOTPLUG_CPU 214#ifdef CONFIG_HOTPLUG_CPU
242#include <asm/genapic.h> 215#include <asm/genapic.h>
243 216