[PATCH 16/16] x86/ioapic.c: unify ioapic_retrigger_irq()

Jeremy Fitzhardinge
2009-06-16T20:18:26Z

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>
---
arch/x86/kernel/apic/io_apic.c | 9 ---------
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 377aac3..c6acce2 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -2176,7 +2176,6 @@ static unsigned int startup_ioapic_irq(unsigned int irq)
return was_pending;
}

-#ifdef CONFIG_X86_64
static int ioapic_retrigger_irq(unsigned int irq)
{

@@ -2189,14 +2188,6 @@ static int ioapic_retrigger_irq(unsigned int irq)

return 1;
}
-#else
-static int ioapic_retrigger_irq(unsigned int irq)
-{
- apic->send_IPI_self(irq_cfg(irq)->vector);
-
- return 1;
-}
-#endif

/*
* Level and edge triggered IO-APIC interrupts need different handling,
--
1.6.2.2