[PATCH 1/2] ioapic: Refactor EOI

[Damien Zammit]

---
 i386/i386/irq.c         | 1 -
 i386/i386at/interrupt.S | 1 -
 i386/i386at/ioapic.c    | 2 ++
 x86_64/interrupt.S      | 1 -
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/i386/i386/irq.c b/i386/i386/irq.c
index 42921617..a7c98890 100644
--- a/i386/i386/irq.c
+++ b/i386/i386/irq.c
@@ -31,7 +31,6 @@ irq_eoi (struct irqdev *dev, int id)
 {
 #ifdef APIC
   ioapic_irq_eoi (dev->irq[id]);
-  lapic_eoi ();
 #endif
 }
 
diff --git a/i386/i386at/interrupt.S b/i386/i386at/interrupt.S
index cb314d32..e6a6af00 100644
--- a/i386/i386at/interrupt.S
+++ b/i386/i386at/interrupt.S
@@ -92,7 +92,6 @@ _isa_eoi:
        pushl   %ecx                    /* push irq number */
        call    EXT(ioapic_irq_eoi)     /* ioapic irq specific EOI */
        addl    $4,%esp                 /* pop irq number */
-       call    EXT(lapic_eoi)          /* lapic broadcast EOI */
 _no_eoi:
        ret
 #endif
diff --git a/i386/i386at/ioapic.c b/i386/i386at/ioapic.c
index 30ae30e1..4d0f4fca 100644
--- a/i386/i386at/ioapic.c
+++ b/i386/i386at/ioapic.c
@@ -262,6 +262,8 @@ ioapic_irq_eoi(int pin)
         entry.both = ioapic_read_entry(apic, pin);
         ioapic->eoi.r = entry.both.vector;
     }
+
+    lapic_eoi ();
 }
 
 void
diff --git a/x86_64/interrupt.S b/x86_64/interrupt.S
index 0dfda313..fccf6e28 100644
--- a/x86_64/interrupt.S
+++ b/x86_64/interrupt.S
@@ -96,7 +96,6 @@ ENTRY(interrupt)
 _isa_eoi:
        movl    %ecx,%edi               /* load irq number as 1st arg */
        call    EXT(ioapic_irq_eoi)     /* ioapic irq specific EOI */
-       call    EXT(lapic_eoi)          /* lapic broadcast EOI */
 _no_eoi:
        ret
 #endif
-- 
2.30.1