summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/irq.h
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2009-02-06 23:09:41 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-09 12:16:05 +0100
commit7c1d7cdcef1b54f4a78892b6b99d19f12c4f398e (patch)
treeb682c8a8d4ee0cf00de2ee6d00cd8fea37ad6339 /arch/x86/include/asm/irq.h
parentx86: add handle_irq() to allow interrupt injection (diff)
downloadlinux-7c1d7cdcef1b54f4a78892b6b99d19f12c4f398e.tar.xz
linux-7c1d7cdcef1b54f4a78892b6b99d19f12c4f398e.zip
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/include/asm/irq.h')
-rw-r--r--arch/x86/include/asm/irq.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/include/asm/irq.h b/arch/x86/include/asm/irq.h
index d0f6f7d1771c..107eb2196691 100644
--- a/arch/x86/include/asm/irq.h
+++ b/arch/x86/include/asm/irq.h
@@ -36,11 +36,12 @@ static inline int irq_canonicalize(int irq)
extern void fixup_irqs(void);
#endif
-extern unsigned int do_IRQ(struct pt_regs *regs);
extern void init_IRQ(void);
extern void native_init_IRQ(void);
extern bool handle_irq(unsigned irq, struct pt_regs *regs);
+extern unsigned int do_IRQ(struct pt_regs *regs);
+
/* Interrupt vector management */
extern DECLARE_BITMAP(used_vectors, NR_VECTORS);
extern int vector_used_by_percpu_irq(unsigned int vector);