* [PATCH] x86: apic - unify smp_spurious/error_interrupt declaration
@ 2008-08-25 17:27 Cyrill Gorcunov
2008-08-26 8:18 ` Ingo Molnar
0 siblings, 1 reply; 2+ messages in thread
From: Cyrill Gorcunov @ 2008-08-25 17:27 UTC (permalink / raw)
To: Ingo Molnar, Maciej W. Rozycki; +Cc: H. Peter Anvin, Thomas Gleixner, LKML
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 <gorcunov@gmail.com>
---
Index: linux-2.6.git/arch/x86/kernel/apic.c
===================================================================
--- linux-2.6.git.orig/arch/x86/kernel/apic.c 2008-08-25 19:46:29.000000000 +0400
+++ linux-2.6.git/arch/x86/kernel/apic.c 2008-08-25 21:04:14.000000000 +0400
@@ -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;
Index: linux-2.6.git/include/asm-x86/hw_irq.h
===================================================================
--- linux-2.6.git.orig/include/asm-x86/hw_irq.h 2008-08-24 12:56:26.000000000 +0400
+++ linux-2.6.git/include/asm-x86/hw_irq.h 2008-08-25 21:05:20.000000000 +0400
@@ -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 *);
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] x86: apic - unify smp_spurious/error_interrupt declaration
2008-08-25 17:27 [PATCH] x86: apic - unify smp_spurious/error_interrupt declaration Cyrill Gorcunov
@ 2008-08-26 8:18 ` Ingo Molnar
0 siblings, 0 replies; 2+ messages in thread
From: Ingo Molnar @ 2008-08-26 8:18 UTC (permalink / raw)
To: Cyrill Gorcunov; +Cc: Maciej W. Rozycki, H. Peter Anvin, Thomas Gleixner, LKML
* Cyrill Gorcunov <gorcunov@gmail.com> wrote:
> 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 <gorcunov@gmail.com>
applied to tip/irq/sparseirq, thanks Cyrill.
Ingo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-08-26 8:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-25 17:27 [PATCH] x86: apic - unify smp_spurious/error_interrupt declaration Cyrill Gorcunov
2008-08-26 8:18 ` Ingo Molnar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox