diff options
author | Cyrill Gorcunov <gorcunov@gmail.com> | 2008-08-25 13:27:26 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-16 10:53:04 -0400 |
commit | 1dd6ba2e179773597e20f17f66049a64e6c4b2ec (patch) | |
tree | 90c75872415c49b03876111d505c7bbc62cbb7bf /arch/x86/kernel | |
parent | 8c464a4b23ca283b414022ebc77787f3c7040fa7 (diff) |
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')
-rw-r--r-- | arch/x86/kernel/apic.c | 8 |
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) | |||
1659 | /* | 1659 | /* |
1660 | * This interrupt should _never_ happen with our APIC/SMP architecture | 1660 | * This interrupt should _never_ happen with our APIC/SMP architecture |
1661 | */ | 1661 | */ |
1662 | #ifdef CONFIG_X86_64 | ||
1663 | asmlinkage void smp_spurious_interrupt(void) | ||
1664 | #else | ||
1665 | void smp_spurious_interrupt(struct pt_regs *regs) | 1662 | void smp_spurious_interrupt(struct pt_regs *regs) |
1666 | #endif | ||
1667 | { | 1663 | { |
1668 | u32 v; | 1664 | u32 v; |
1669 | 1665 | ||
@@ -1694,11 +1690,7 @@ void smp_spurious_interrupt(struct pt_regs *regs) | |||
1694 | /* | 1690 | /* |
1695 | * This interrupt should never happen with our APIC/SMP architecture | 1691 | * This interrupt should never happen with our APIC/SMP architecture |
1696 | */ | 1692 | */ |
1697 | #ifdef CONFIG_X86_64 | ||
1698 | asmlinkage void smp_error_interrupt(void) | ||
1699 | #else | ||
1700 | void smp_error_interrupt(struct pt_regs *regs) | 1693 | void smp_error_interrupt(struct pt_regs *regs) |
1701 | #endif | ||
1702 | { | 1694 | { |
1703 | u32 v, v1; | 1695 | u32 v, v1; |
1704 | 1696 | ||