From 03d0f482ba4a4b0ad0977928cf67d93aa18fb1f1 Mon Sep 17 00:00:00 2001
From: markm <markm@FreeBSD.org>
Date: Sat, 21 Sep 2002 19:03:42 +0000
Subject: [PATCH] Use a function instead of a non-portable, GCC-specific asm()
 entry.

---
 sys/i386/i386/mpapic.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys/i386/i386/mpapic.c b/sys/i386/i386/mpapic.c
index 85346bf6fff5..6886b4f911c6 100644
--- a/sys/i386/i386/mpapic.c
+++ b/sys/i386/i386/mpapic.c
@@ -32,6 +32,7 @@
 #include <sys/mutex.h>
 #include <sys/proc.h>
 
+#include <machine/cpufunc.h>
 #include <machine/smptests.h>	/** TEST_TEST1 */
 #include <machine/smp.h>
 #include <machine/mpapic.h>
@@ -567,7 +568,7 @@ apic_ipi_singledest(int cpu, int vector, int delivery_mode)
 #endif  /* DETECT_DEADLOCK */
 
 	eflags = read_eflags();
-	__asm __volatile("cli" : : : "memory");
+	disable_intr();
 	icr_hi = lapic.icr_hi & ~APIC_ID_MASK;
 	icr_hi |= (CPU_TO_ID(cpu) << 24);
 	lapic.icr_hi = icr_hi;