i386/MachintrABI: Use low-level INTR{EN,DIS} in intr_{setup,teardown}

This merges 26cf64b268c65144b898d5d00883a252da364c03

diff --git a/sys/platform/pc32/apic/ioapic_abi.c b/sys/platform/pc32/apic/ioapic_abi.c
index fc9bbd8..2923186 100644 (file)
--- a/sys/platform/pc32/apic/ioapic_abi.c
+++ b/sys/platform/pc32/apic/ioapic_abi.c
@@ -647,7 +647,7 @@ ioapic_abi_intr_setup(int intr, int flags)
 
        imen_unlock();
 
-       machintr_intr_enable(intr);
+       IOAPIC_INTREN(intr);
 
        write_eflags(ef);
 }
@@ -683,7 +683,7 @@ ioapic_abi_intr_teardown(int intr)
         * Teardown an interrupt vector.  The vector should already be
         * installed in the cpu's IDT, but make sure.
         */
-       machintr_intr_disable(intr);
+       IOAPIC_INTRDIS(intr);
 
        vector = IDT_OFFSET + intr;
 

diff --git a/sys/platform/pc32/icu/icu_abi.c b/sys/platform/pc32/icu/icu_abi.c
index 02a2a8d..687831c 100644 (file)
--- a/sys/platform/pc32/icu/icu_abi.c
+++ b/sys/platform/pc32/icu/icu_abi.c
@@ -247,7 +247,7 @@ icu_abi_intr_setup(int intr, int flags __unused)
        ef = read_eflags();
        cpu_disable_intr();
 
-       machintr_intr_enable(intr);
+       ICU_INTREN(intr);
 
        write_eflags(ef);
 }
@@ -274,7 +274,7 @@ icu_abi_intr_teardown(int intr)
        ef = read_eflags();
        cpu_disable_intr();
 
-       machintr_intr_disable(intr);
+       ICU_INTRDIS(intr);
 
        write_eflags(ef);
 }