From 64ecbc4d0bed32f0070aed169ebcbe27d00e5e15 Mon Sep 17 00:00:00 2001
From: Mike Smith <msmith@FreeBSD.org>
Date: Thu, 29 Jul 1999 07:10:35 +0000
Subject: [PATCH] Remove some duplicate definitions, as suggested by Alan Cox.

---
 sys/amd64/amd64/genassym.c | 4 +++-
 sys/i386/i386/bioscall.s   | 7 +------
 sys/i386/i386/genassym.c   | 4 +++-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c
index dc5a18d61bf7..4e53d477d81f 100644
--- a/sys/amd64/amd64/genassym.c
+++ b/sys/amd64/amd64/genassym.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- *	$Id: genassym.c,v 1.72 1999/07/06 07:13:32 cracauer Exp $
+ *	$Id: genassym.c,v 1.73 1999/07/09 04:15:39 jlemon Exp $
  */
 
 #include "opt_user_ldt.h"
@@ -232,6 +232,8 @@ main()
 #ifdef SMP
 	printf("#define\tKPSEL %#x\n", GSEL(GPRIV_SEL, SEL_KPL));
 #endif
+	printf("#define\tBC32SEL %#x\n", GSEL(GBIOSCODE32_SEL, SEL_KPL));
+	printf("#define\tBSSSEL %#x\n", GSEL(GBIOSSTACK_SEL, SEL_KPL));
 	printf("#define\tGPROC0_SEL %#x\n", GPROC0_SEL);
 	printf("#define\tVM86_FRAMESIZE %#x\n", sizeof(struct vm86frame));
 
diff --git a/sys/i386/i386/bioscall.s b/sys/i386/i386/bioscall.s
index 3b27ad299c01..5e325bae8653 100644
--- a/sys/i386/i386/bioscall.s
+++ b/sys/i386/i386/bioscall.s
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: bioscall.s,v 1.1 1997/08/01 06:07:13 msmith Exp $
+ *      $Id: bioscall.s,v 1.2 1999/07/29 01:49:18 msmith Exp $
  */
 
 /*
@@ -34,11 +34,6 @@
 
 #include "assym.s"
 
-#define	KCSEL		0x08 		/* GSEL(GCODE_SEL, SEL_KPL) */
-#define	KDSEL		0x10 		/* GSEL(GDATA_SEL, SEL_KPL) */
-#define	BC32SEL		0x40 		/* GSEL(GBIOSCODE32_SEL, SEL_KPL) */
-#define	BSSEL		0x60 		/* GSEL(GBIOSSTACK_SEL, SEL_KPL) */
-
 #define data16		.byte	0x66
 
 	.data
diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c
index dc5a18d61bf7..4e53d477d81f 100644
--- a/sys/i386/i386/genassym.c
+++ b/sys/i386/i386/genassym.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- *	$Id: genassym.c,v 1.72 1999/07/06 07:13:32 cracauer Exp $
+ *	$Id: genassym.c,v 1.73 1999/07/09 04:15:39 jlemon Exp $
  */
 
 #include "opt_user_ldt.h"
@@ -232,6 +232,8 @@ main()
 #ifdef SMP
 	printf("#define\tKPSEL %#x\n", GSEL(GPRIV_SEL, SEL_KPL));
 #endif
+	printf("#define\tBC32SEL %#x\n", GSEL(GBIOSCODE32_SEL, SEL_KPL));
+	printf("#define\tBSSSEL %#x\n", GSEL(GBIOSSTACK_SEL, SEL_KPL));
 	printf("#define\tGPROC0_SEL %#x\n", GPROC0_SEL);
 	printf("#define\tVM86_FRAMESIZE %#x\n", sizeof(struct vm86frame));