From owner-p4-projects@FreeBSD.ORG  Fri Apr  4 17:03:57 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6721C37B404; Fri,  4 Apr 2003 17:03:57 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 07C2F37B401
	for <perforce@freebsd.org>; Fri,  4 Apr 2003 17:03:57 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A687843FA3
	for <perforce@freebsd.org>; Fri,  4 Apr 2003 17:03:56 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3513u0U087489
	for <perforce@freebsd.org>; Fri, 4 Apr 2003 17:03:56 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3513uhx087486
	for perforce@freebsd.org; Fri, 4 Apr 2003 17:03:56 -0800 (PST)
Date: Fri, 4 Apr 2003 17:03:56 -0800 (PST)
Message-Id: <200304050103.h3513uhx087486@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 28099 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Apr 2003 01:03:58 -0000

http://perforce.freebsd.org/chv.cgi?CH=28099

Change 28099 by peter@peter_overcee on 2003/04/04 17:03:30

	fix some duplicate fields.  #if 0 some no longer usable prototypes
	for functions.  There is no descriptor union anymore, as some
	descriptors are double entries.

Affected files ...

.. //depot/projects/hammer/sys/x86_64/include/segments.h#11 edit

Differences ...

==== //depot/projects/hammer/sys/x86_64/include/segments.h#11 (text+ko) ====

@@ -93,7 +93,7 @@
 	u_int64_t sd_hibase:40;		/* segment base address  (msb) */
 	u_int64_t sd_xx1:8;
 	u_int64_t sd_mbz:5;		/* MUST be zero */
-	u_int64_t sd_xx1:19;
+	u_int64_t sd_xx2:19;
 };
 
 /*
@@ -111,7 +111,7 @@
 	u_int64_t gd_hioffset:38;	/* gate offset (msb) */
 	u_int64_t sd_xx1:8;
 	u_int64_t sd_mbz:5;		/* MUST be zero */
-	u_int64_t sd_xx1:19;
+	u_int64_t sd_xx2:19;
 };
 
 	/* system segments and gate types */
@@ -207,10 +207,12 @@
 extern union descriptor ldt[NLDT];
 
 void	lgdt(struct region_descriptor *rdp);
+#if 0
 void	sdtossd(struct segment_descriptor *sdp,
 	    struct soft_segment_descriptor *ssdp);
 void	ssdtosd(struct soft_segment_descriptor *ssdp,
 	    struct segment_descriptor *sdp);
+#endif
 #endif /* _KERNEL */
 
 #endif /* !_MACHINE_SEGMENTS_H_ */