aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2009-06-08 06:49:01 -0400
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2009-07-14 16:32:51 -0400
commite25371d60cb06a44d7a32d7966ab9bfbeacb9390 (patch)
tree1b80f2d12ee070d80ce36d4cc111794a10d91f1b /arch/x86/kernel/apic
parent638f2f8c52a92c15ebda9e50d84c1ab56fc42e42 (diff)
x86/ioapic.c: unify ioapic_retrigger_irq()
The 32 and 64-bit versions of ioapic_retrigger_irq() are identical except the 64-bit one takes vector_lock. vector_lock is defined and used on 32-bit too, so just use a common ioapic_retrigger_irq(). Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Diffstat (limited to 'arch/x86/kernel/apic')
-rw-r--r--arch/x86/kernel/apic/io_apic.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 17883cd82592..cf51b0b58c56 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -2178,7 +2178,6 @@ static unsigned int startup_ioapic_irq(unsigned int irq)
2178 return was_pending; 2178 return was_pending;
2179} 2179}
2180 2180
2181#ifdef CONFIG_X86_64
2182static int ioapic_retrigger_irq(unsigned int irq) 2181static int ioapic_retrigger_irq(unsigned int irq)
2183{ 2182{
2184 2183
@@ -2191,14 +2190,6 @@ static int ioapic_retrigger_irq(unsigned int irq)
2191 2190
2192 return 1; 2191 return 1;
2193} 2192}
2194#else
2195static int ioapic_retrigger_irq(unsigned int irq)
2196{
2197 apic->send_IPI_self(irq_cfg(irq)->vector);
2198
2199 return 1;
2200}
2201#endif
2202 2193
2203/* 2194/*
2204 * Level and edge triggered IO-APIC interrupts need different handling, 2195 * Level and edge triggered IO-APIC interrupts need different handling,