[Glibc-bsd-commits] r1537 - trunk/kfreebsd-kernel-headers/debian/patches

[Petr Salinger]

Author: ps-guest
Date: 2006-05-02 19:31:15 +0000 (Tue, 02 May 2006)
New Revision: 1537

Modified:
   trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff
Log:
* cleanup of segments.h 


Modified: trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff	2006-05-02 17:03:53 UTC (rev 1536)
+++ trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff	2006-05-02 19:31:15 UTC (rev 1537)
@@ -1,86 +1,20 @@
 --- sys/i386/include/segments.h.old	2004-12-01 03:21:53.000000000 +0100
 +++ sys/i386/include/segments.h	2004-12-01 03:23:54.000000000 +0100
-@@ -59,30 +59,30 @@
-  * Memory and System segment descriptors
+@@ -60,7 +60,7 @@
   */
  struct	segment_descriptor	{
--	unsigned sd_lolimit:16 ;	/* segment extent (lsb) */
+ 	unsigned sd_lolimit:16 ;	/* segment extent (lsb) */
 -	unsigned sd_lobase:24 __packed;	/* segment base address (lsb) */
--	unsigned sd_type:5 ;		/* segment type */
--	unsigned sd_dpl:2 ;		/* segment descriptor priority level */
--	unsigned sd_p:1 ;		/* segment descriptor present */
--	unsigned sd_hilimit:4 ;		/* segment extent (msb) */
--	unsigned sd_xx:2 ;		/* unused */
--	unsigned sd_def32:1 ;		/* default 32 vs 16 bit size */
--	unsigned sd_gran:1 ;		/* limit granularity (byte/page units)*/
--	unsigned sd_hibase:8 ;		/* segment base address  (msb) */
-+	unsigned sd_lolimit;		/* segment extent (lsb) */
-+	unsigned sd_lobase;		/* segment base address (lsb) */
-+	unsigned sd_type;		/* segment type */
-+	unsigned sd_dpl;		/* segment descriptor priority level */
-+	unsigned sd_p;			/* segment descriptor present */
-+	unsigned sd_hilimit;		/* segment extent (msb) */
-+	unsigned sd_xx;			/* unused */
-+	unsigned sd_def32;		/* default 32 vs 16 bit size */
-+	unsigned sd_gran;		/* limit granularity (byte/page units)*/
-+	unsigned sd_hibase;		/* segment base address  (msb) */
- } ;
- 
- /*
-  * Gate descriptors (e.g. indirect descriptors)
++	unsigned sd_lobase:24 __attribute__((packed));	/* segment base address (lsb) */
+ 	unsigned sd_type:5 ;		/* segment type */
+ 	unsigned sd_dpl:2 ;		/* segment descriptor priority level */
+ 	unsigned sd_p:1 ;		/* segment descriptor present */
+@@ -152,7 +152,7 @@
   */
- struct	gate_descriptor	{
--	unsigned gd_looffset:16 ;	/* gate offset (lsb) */
--	unsigned gd_selector:16 ;	/* gate segment selector */
--	unsigned gd_stkcpy:5 ;		/* number of stack wds to cpy */
--	unsigned gd_xx:3 ;		/* unused */
--	unsigned gd_type:5 ;		/* segment type */
--	unsigned gd_dpl:2 ;		/* segment descriptor priority level */
--	unsigned gd_p:1 ;		/* segment descriptor present */
--	unsigned gd_hioffset:16 ;	/* gate offset (msb) */
-+	unsigned gd_looffset;		/* gate offset (lsb) */
-+	unsigned gd_selector;		/* gate segment selector */
-+	unsigned gd_stkcpy;		/* number of stack wds to cpy */
-+	unsigned gd_xx;			/* unused */
-+	unsigned gd_type;		/* segment type */
-+	unsigned gd_dpl;		/* segment descriptor priority level */
-+	unsigned gd_p;			/* segment descriptor present */
-+	unsigned gd_hioffset;	   	/* gate offset (msb) */
- } ;
- 
- /*
-@@ -136,23 +136,23 @@
-  */
- 
- struct	soft_segment_descriptor	{
--	unsigned ssd_base ;		/* segment base address  */
--	unsigned ssd_limit ;		/* segment extent */
--	unsigned ssd_type:5 ;		/* segment type */
--	unsigned ssd_dpl:2 ;		/* segment descriptor priority level */
--	unsigned ssd_p:1 ;		/* segment descriptor present */
--	unsigned ssd_xx:4 ;		/* unused */
--	unsigned ssd_xx1:2 ;		/* unused */
--	unsigned ssd_def32:1 ;		/* default 32 vs 16 bit size */
--	unsigned ssd_gran:1 ;		/* limit granularity (byte/page units)*/
-+	unsigned ssd_base;		/* segment base address  */
-+	unsigned ssd_limit;		/* segment extent */
-+	unsigned ssd_type;		/* segment type */
-+	unsigned ssd_dpl;		/* segment descriptor priority level */
-+	unsigned ssd_p;			/* segment descriptor present */
-+	unsigned ssd_xx;		/* unused */
-+	unsigned ssd_xx1;		/* unused */
-+	unsigned ssd_def32;		/* default 32 vs 16 bit size */
-+	unsigned ssd_gran;		/* limit granularity (byte/page units)*/
- };
- 
- /*
-  * region descriptors, used to load gdt/idt tables before segments yet exist.
-  */
  struct region_descriptor {
--	unsigned rd_limit:16;		/* segment extent */
+ 	unsigned rd_limit:16;		/* segment extent */
 -	unsigned rd_base:32 __packed;	/* base address  */
-+	unsigned rd_limit;		/* segment extent */
-+	unsigned rd_base;		/* base address  */
++	unsigned rd_base:32 __attribute__((packed));	/* base address  */
  };
  
  /*