From 26cf64b268c65144b898d5d00883a252da364c03 Mon Sep 17 00:00:00 2001 From: Sepherosa Ziehau Date: Fri, 16 Dec 2011 17:20:00 +0800 Subject: [PATCH] x86_64/MachintrABI: Use low-level INTR{EN,DIS} in intr_{setup,teardown} intr_{setup,teardown} have already done enough verification for the 'intr' parameter --- sys/platform/pc64/apic/ioapic_abi.c | 4 ++-- sys/platform/pc64/icu/icu_abi.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/platform/pc64/apic/ioapic_abi.c b/sys/platform/pc64/apic/ioapic_abi.c index 336727f2f8..c5239a9ded 100644 --- a/sys/platform/pc64/apic/ioapic_abi.c +++ b/sys/platform/pc64/apic/ioapic_abi.c @@ -646,7 +646,7 @@ ioapic_abi_intr_setup(int intr, int flags) imen_unlock(); - machintr_intr_enable(intr); + IOAPIC_INTREN(intr); write_rflags(ef); } @@ -682,7 +682,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/pc64/icu/icu_abi.c b/sys/platform/pc64/icu/icu_abi.c index b3e481e90d..cdf327e13c 100644 --- a/sys/platform/pc64/icu/icu_abi.c +++ b/sys/platform/pc64/icu/icu_abi.c @@ -247,7 +247,7 @@ icu_abi_intr_setup(int intr, int flags) ef = read_rflags(); cpu_disable_intr(); - machintr_intr_enable(intr); + ICU_INTREN(intr); write_rflags(ef); } @@ -274,7 +274,7 @@ icu_abi_intr_teardown(int intr) ef = read_rflags(); cpu_disable_intr(); - machintr_intr_disable(intr); + ICU_INTRDIS(intr); write_rflags(ef); } -- 2.41.0