diff options
-rw-r--r-- | arch/x86/kernel/apic.c | 8 | ||||
-rw-r--r-- | include/asm-x86/hw_irq.h | 5 |
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 | ||
1663 | asmlinkage void smp_spurious_interrupt(void) | ||
1664 | #else | ||
1665 | void smp_spurious_interrupt(struct pt_regs *regs) | 1662 | void 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 | ||
1698 | asmlinkage void smp_error_interrupt(void) | ||
1699 | #else | ||
1700 | void smp_error_interrupt(struct pt_regs *regs) | 1693 | void 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 */ |
98 | extern void smp_apic_timer_interrupt(struct pt_regs *); | 98 | extern void smp_apic_timer_interrupt(struct pt_regs *); |
99 | #ifdef CONFIG_X86_32 | ||
100 | extern void smp_spurious_interrupt(struct pt_regs *); | 99 | extern void smp_spurious_interrupt(struct pt_regs *); |
101 | extern void smp_error_interrupt(struct pt_regs *); | 100 | extern void smp_error_interrupt(struct pt_regs *); |
102 | #else | ||
103 | extern asmlinkage void smp_spurious_interrupt(void); | ||
104 | extern asmlinkage void smp_error_interrupt(void); | ||
105 | #endif | ||
106 | #ifdef CONFIG_X86_SMP | 101 | #ifdef CONFIG_X86_SMP |
107 | extern void smp_reschedule_interrupt(struct pt_regs *); | 102 | extern void smp_reschedule_interrupt(struct pt_regs *); |
108 | extern void smp_call_function_interrupt(struct pt_regs *); | 103 | extern void smp_call_function_interrupt(struct pt_regs *); |