diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-06-05 19:36:26 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-06-05 19:36:26 +0000 |
| commit | 1bdf3d7e0aba1d3ceccd927c2404a9df58ce9f28 (patch) | |
| tree | 8edef6f4f889466962ad8d2efbe6cc5f87af35a9 /sys | |
| parent | b82efb5c7cc2a45e563de42af82ffde1cbca7b16 (diff) | |
reduce unneccessary differences; ok kettenis
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/include/i82093reg.h | 5 | ||||
| -rw-r--r-- | sys/arch/i386/include/i82093reg.h | 10 |
2 files changed, 7 insertions, 8 deletions
diff --git a/sys/arch/amd64/include/i82093reg.h b/sys/arch/amd64/include/i82093reg.h index 432b84ea77e..e4ab947545e 100644 --- a/sys/arch/amd64/include/i82093reg.h +++ b/sys/arch/amd64/include/i82093reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: i82093reg.h,v 1.3 2008/06/26 05:42:09 ray Exp $ */ +/* $OpenBSD: i82093reg.h,v 1.4 2011/06/05 19:36:25 deraadt Exp $ */ /* $NetBSD: i82093reg.h,v 1.1 2003/02/26 21:26:10 fvdl Exp $ */ /*- @@ -46,9 +46,6 @@ * store the register number of interest in IOAPIC_REG, and store/fetch * the real value in IOAPIC_DATA. */ - - - #define IOAPIC_REG 0x0000 #define IOAPIC_DATA 0x0010 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 |