PERFORCE change 28099 for review

[Peter Wemm]

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

Change 28099 by peter at 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_ */