aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/apic.c8
-rw-r--r--include/asm-x86/hw_irq.h5
2 files changed, 0 insertions, 13 deletions
diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c
index ca5ef71f4208..0556f375e40b 100644
--- a/arch/x86/kernel/apic.c
+++ b/arch/x86/kernel/apic.c
@@ -1659,11 +1659,7 @@ int __init APIC_init_uniprocessor(void)
1659/* 1659/*
1660 * This interrupt should _never_ happen with our APIC/SMP architecture 1660 * This interrupt should _never_ happen with our APIC/SMP architecture
1661 */ 1661 */
1662#ifdef CONFIG_X86_64
1663asmlinkage void smp_spurious_interrupt(void)
1664#else
1665void smp_spurious_interrupt(struct pt_regs *regs) 1662void smp_spurious_interrupt(struct pt_regs *regs)
1666#endif
1667{ 1663{
1668 u32 v; 1664 u32 v;
1669 1665
@@ -1694,11 +1690,7 @@ void smp_spurious_interrupt(struct pt_regs *regs)
1694/* 1690/*
1695 * This interrupt should never happen with our APIC/SMP architecture 1691 * This interrupt should never happen with our APIC/SMP architecture
1696 */ 1692 */
1697#ifdef CONFIG_X86_64
1698asmlinkage void smp_error_interrupt(void)
1699#else
1700void smp_error_interrupt(struct pt_regs *regs) 1693void smp_error_interrupt(struct pt_regs *regs)
1701#endif
1702{ 1694{
1703 u32 v, v1; 1695 u32 v, v1;
1704 1696
diff --git a/include/asm-x86/hw_irq.h b/include/asm-x86/hw_irq.h
index 39c7a4745d25..749d042f0556 100644
--- a/include/asm-x86/hw_irq.h
+++ b/include/asm-x86/hw_irq.h
@@ -96,13 +96,8 @@ extern asmlinkage void qic_call_function_interrupt(void);
96 96
97/* SMP */ 97/* SMP */
98extern void smp_apic_timer_interrupt(struct pt_regs *); 98extern void smp_apic_timer_interrupt(struct pt_regs *);
99#ifdef CONFIG_X86_32
100extern void smp_spurious_interrupt(struct pt_regs *); 99extern void smp_spurious_interrupt(struct pt_regs *);
101extern void smp_error_interrupt(struct pt_regs *); 100extern void smp_error_interrupt(struct pt_regs *);
102#else
103extern asmlinkage void smp_spurious_interrupt(void);
104extern asmlinkage void smp_error_interrupt(void);
105#endif
106#ifdef CONFIG_X86_SMP 101#ifdef CONFIG_X86_SMP
107extern void smp_reschedule_interrupt(struct pt_regs *); 102extern void smp_reschedule_interrupt(struct pt_regs *);
108extern void smp_call_function_interrupt(struct pt_regs *); 103extern void smp_call_function_interrupt(struct pt_regs *);