Skip to contentSkip to conversation

x86: apic - unify smp_spurious/error_interrupt declaration

PATCH Applied Cyrill Gorcunov 2 participants 2 messages Aug 25, 2008 – Aug 26, 2008 x86

lore
Share & tools
lore

Cyrill Gorcunov

author
#0 lore raw

PATCH 1/1 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 safetly may merge the declarations.

Signed-off-by Cyrill Gorcunov <[email protected]>

---

arch/x86/kernel/apic.c +0 -8
Index: linux-2.6.git/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_re
 /*
  * 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
Index: linux-2.6.git/include/asm-x86/hw_irq.h
===================================================================
@@ -96,13 +96,8 @@ extern asmlinkage void qic_call_function
 
 /* 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 *);
Applied
#1 lore raw
Quoted 5 lines · Cyrill Gorcunov

According to entry_64.S we do pass pt_regs pointer into interrupt handlers but don't use them. So we safetly may merge the declarations.

Signed-off-by Cyrill Gorcunov <[email protected]>

applied to tip/irq/sparseirq, thanks Cyrill.

Ingo