From e9954786025ee41e7cad4b7a90f5c1b17e21c54f Mon Sep 17 00:00:00 2001 From: Kevin Lo Date: Fri, 26 Jul 2019 04:35:39 +0000 Subject: emove duplicate definitions of LAPIC_ID_MASK and LAPIC_ID_SHIFT. "yes please" guenther@ --- sys/arch/amd64/include/i82489reg.h | 4 +--- sys/arch/i386/include/i82489reg.h | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/arch/amd64/include/i82489reg.h b/sys/arch/amd64/include/i82489reg.h index 4794af04895..f15ecd68e0b 100644 --- a/sys/arch/amd64/include/i82489reg.h +++ b/sys/arch/amd64/include/i82489reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: i82489reg.h,v 1.4 2015/07/21 04:48:33 uebayasi Exp $ */ +/* $OpenBSD: i82489reg.h,v 1.5 2019/07/26 04:35:38 kevlo Exp $ */ /* $NetBSD: i82489reg.h,v 1.1 2003/02/26 21:26:10 fvdl Exp $ */ /*- @@ -105,8 +105,6 @@ #define LAPIC_ICRHI 0x310 /* Int. cmd. RW */ -# define LAPIC_ID_MASK 0x0f000000 -# define LAPIC_ID_SHIFT 24 #define LAPIC_LVTT 0x320 /* Loc.vec.(timer) RW */ # define LAPIC_LVTT_VEC_MASK 0x000000ff diff --git a/sys/arch/i386/include/i82489reg.h b/sys/arch/i386/include/i82489reg.h index 1b90f4f2a4f..763a13e824f 100644 --- a/sys/arch/i386/include/i82489reg.h +++ b/sys/arch/i386/include/i82489reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: i82489reg.h,v 1.4 2015/07/21 06:19:50 uebayasi Exp $ */ +/* $OpenBSD: i82489reg.h,v 1.5 2019/07/26 04:35:38 kevlo Exp $ */ /* $NetBSD: i82489reg.h,v 1.1.2.1 2000/02/20 16:30:27 sommerfeld Exp $ */ /*- @@ -105,8 +105,6 @@ #define LAPIC_ICRHI 0x310 /* Int. cmd. RW */ -# define LAPIC_ID_MASK 0x0f000000 -# define LAPIC_ID_SHIFT 24 #define LAPIC_LVTT 0x320 /* Loc.vec.(timer) RW */ # define LAPIC_LVTT_VEC_MASK 0x000000ff -- cgit v1.2.3