Commit 1dd6ba2e authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar
Browse files

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: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 8c464a4b

arch/x86/kernel/apic.c

+0 −8
Original line number Diff line number Diff line
@@ -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;

include/asm-x86/hw_irq.h

+0 −5
Original line number Diff line number Diff line
@@ -96,13 +96,8 @@ extern asmlinkage void qic_call_function_interrupt(void); 


/* SMP */

extern void smp_apic_timer_interrupt(struct pt_regs *);

#ifdef CONFIG_X86_32

extern void smp_spurious_interrupt(struct pt_regs *);

extern void smp_error_interrupt(struct pt_regs *);

#else

extern asmlinkage void smp_spurious_interrupt(void);

extern asmlinkage void smp_error_interrupt(void);

#endif

#ifdef CONFIG_X86_SMP

extern void smp_reschedule_interrupt(struct pt_regs *);

extern void smp_call_function_interrupt(struct pt_regs *);