summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2011-06-05 19:36:26 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2011-06-05 19:36:26 +0000
commit1bdf3d7e0aba1d3ceccd927c2404a9df58ce9f28 (patch)
tree8edef6f4f889466962ad8d2efbe6cc5f87af35a9 /sys/arch/i386
parentb82efb5c7cc2a45e563de42af82ffde1cbca7b16 (diff)
reduce unneccessary differences; ok kettenis
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/include/i82093reg.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/arch/i386/include/i82093reg.h b/sys/arch/i386/include/i82093reg.h
index d2ca11aafe3..9de8480ea63 100644
--- a/sys/arch/i386/include/i82093reg.h
+++ b/sys/arch/i386/include/i82093reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: i82093reg.h,v 1.4 2008/06/26 05:42:10 ray Exp $ */
+/* $OpenBSD: i82093reg.h,v 1.5 2011/06/05 19:36:25 deraadt Exp $ */
/* $NetBSD: i82093reg.h,v 1.1.2.2 2000/02/21 18:54:07 sommerfeld Exp $ */
/*-
@@ -57,8 +57,6 @@
#define IOAPIC_ID_SHIFT 24
#define IOAPIC_ID_MASK 0x0f000000
-#define IOAPIC_ID_MAX \
- ((IOAPIC_ID_MASK >> IOAPIC_ID_SHIFT) + 1)
/* Version, and maximum interrupt pin number. */
@@ -112,5 +110,9 @@
#define IMCR_PIC 0x00
#define IMCR_APIC 0x01
+#ifdef _KERNEL
+
#define ioapic_asm_ack(num) \
- movl $0,_C_LABEL(local_apic) + LAPIC_EOI
+ movl $0,_C_LABEL(local_apic) + LAPIC_EOI
+
+#endif