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

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
...@@ -1659,11 +1659,7 @@ int __init APIC_init_uniprocessor(void) ...@@ -1659,11 +1659,7 @@ int __init APIC_init_uniprocessor(void)
/* /*
* This interrupt should _never_ happen with our APIC/SMP architecture * 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) void smp_spurious_interrupt(struct pt_regs *regs)
#endif
{ {
u32 v; u32 v;
...@@ -1694,11 +1690,7 @@ void smp_spurious_interrupt(struct pt_regs *regs) ...@@ -1694,11 +1690,7 @@ void smp_spurious_interrupt(struct pt_regs *regs)
/* /*
* This interrupt should never happen with our APIC/SMP architecture * 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) void smp_error_interrupt(struct pt_regs *regs)
#endif
{ {
u32 v, v1; u32 v, v1;
......
...@@ -96,13 +96,8 @@ extern asmlinkage void qic_call_function_interrupt(void); ...@@ -96,13 +96,8 @@ extern asmlinkage void qic_call_function_interrupt(void);
/* SMP */ /* SMP */
extern void smp_apic_timer_interrupt(struct pt_regs *); extern void smp_apic_timer_interrupt(struct pt_regs *);
#ifdef CONFIG_X86_32
extern void smp_spurious_interrupt(struct pt_regs *); extern void smp_spurious_interrupt(struct pt_regs *);
extern void smp_error_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 #ifdef CONFIG_X86_SMP
extern void smp_reschedule_interrupt(struct pt_regs *); extern void smp_reschedule_interrupt(struct pt_regs *);
extern void smp_call_function_interrupt(struct pt_regs *); extern void smp_call_function_interrupt(struct pt_regs *);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment