diff options
author | Andi Kleen <ak@suse.de> | 2006-02-03 21:51:53 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-04 16:43:15 -0800 |
commit | 3777a95903953c55f2309a89679b73c19ae5535b (patch) | |
tree | 45a922a1ff82fc0f3d2a3865bfcb23d68c12792c /include/asm-x86_64 | |
parent | 7f66ae48de27bc9506cff0f2991d74901a0c2f8d (diff) | |
download | kernel_samsung_smdk4412-3777a95903953c55f2309a89679b73c19ae5535b.zip kernel_samsung_smdk4412-3777a95903953c55f2309a89679b73c19ae5535b.tar.gz kernel_samsung_smdk4412-3777a95903953c55f2309a89679b73c19ae5535b.tar.bz2 |
[PATCH] i386/x86-64: Don't ack the APIC for bad interrupts when the APIC is not enabled
It's bad juju to touch the APIC when it hasn't been enabled.
I also moved ack_bad_irq for x86-64 out of line following i386.
Signed-off-by: Andi Kleen <ak@suse.de>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-x86_64')
-rw-r--r-- | include/asm-x86_64/hardirq.h | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/include/asm-x86_64/hardirq.h b/include/asm-x86_64/hardirq.h index 8661b47..8689951 100644 --- a/include/asm-x86_64/hardirq.h +++ b/include/asm-x86_64/hardirq.h @@ -16,23 +16,6 @@ #define set_softirq_pending(x) write_pda(__softirq_pending, (x)) #define or_softirq_pending(x) or_pda(__softirq_pending, (x)) -/* - * 'what should we do if we get a hw irq event on an illegal vector'. - * each architecture has to answer this themselves. - */ -static inline void ack_bad_irq(unsigned int irq) -{ - printk("unexpected IRQ trap at vector %02x\n", irq); -#ifdef CONFIG_X86_LOCAL_APIC - /* - * Currently unexpected vectors happen only on SMP and APIC. - * We _must_ ack these because every local APIC has only N - * irq slots per priority level, and a 'hanging, unacked' IRQ - * holds up an irq slot - in excessive cases (when multiple - * unexpected vectors occur) that might lock up the APIC - * completely. - */ - ack_APIC_irq(); -#endif -} +extern void ack_bad_irq(unsigned int irq); + #endif /* __ASM_HARDIRQ_H */ |