summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic.c
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@gmail.com>2008-08-25 19:27:26 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-16 16:53:04 +0200
commit1dd6ba2e179773597e20f17f66049a64e6c4b2ec (patch)
tree90c75872415c49b03876111d505c7bbc62cbb7bf /arch/x86/kernel/apic.c
parentsparseirq: move kstat_irqs from kstat to irq_desc - fix (diff)
downloadlinux-1dd6ba2e179773597e20f17f66049a64e6c4b2ec.tar.xz
linux-1dd6ba2e179773597e20f17f66049a64e6c4b2ec.zip
x86: apic - unify smp_spurious/error_interrupt declaration
According to entry_64.S we do pass pt_regs pointer into interrupt handlers but don't use them. So we safely may merge the declarations. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic.c')
-rw-r--r--arch/x86/kernel/apic.c8
1 files changed, 0 insertions, 8 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)
/*
* This interrupt should _never_ happen with our APIC/SMP architecture
*/
-#ifdef CONFIG_X86_64
-asmlinkage void smp_spurious_interrupt(void)
-#else
void smp_spurious_interrupt(struct pt_regs *regs)
-#endif
{
u32 v;
@@ -1694,11 +1690,7 @@ void smp_spurious_interrupt(struct pt_regs *regs)
/*
* This interrupt should never happen with our APIC/SMP architecture
*/
-#ifdef CONFIG_X86_64
-asmlinkage void smp_error_interrupt(void)
-#else
void smp_error_interrupt(struct pt_regs *regs)
-#endif
{
u32 v, v1;