Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 22 Sep 2002 23:57:15 -0700 (PDT)
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 17975 for review
Message-ID:  <200209230657.g8N6vFtq063135@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17975

Change 17975 by peter@peter_overcee on 2002/09/22 23:56:20

	integrate i386_hammer for segments.h tweaks and __packed crud

Affected files ...

.. //depot/projects/hammer/sys/x86_64/include/npx.h#5 integrate
.. //depot/projects/hammer/sys/x86_64/include/segments.h#7 integrate

Differences ...

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

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.h	5.3 (Berkeley) 1/18/91
- * $FreeBSD: src/sys/i386/include/npx.h,v 1.25 2002/09/16 19:25:41 mini Exp $
+ * $FreeBSD: src/sys/i386/include/npx.h,v 1.26 2002/09/23 05:55:10 peter Exp $
  */
 
 /*
@@ -75,7 +75,7 @@
 	} sv_fp[8];
 	struct xmmacc	sv_xmm[16];
 	u_char sv_pad[96];
-} __attribute__((aligned(16)));
+} __aligned(16);
 
 /*
  * The hardware default control word for i387's and later coprocessors is

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

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)segments.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/i386/include/segments.h,v 1.30 2002/09/22 04:45:21 peter Exp $
+ * $FreeBSD: src/sys/i386/include/segments.h,v 1.31 2002/09/23 06:50:07 peter Exp $
  */
 
 #ifndef _MACHINE_SEGMENTS_H_
@@ -64,8 +64,7 @@
  */
 struct	segment_descriptor	{
 	unsigned sd_lolimit:16 ;	/* segment extent (lsb) */
-	unsigned sd_lobase:24 __attribute__ ((packed));
-					/* segment base address (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 */
@@ -82,8 +81,7 @@
  */
 struct	segment_descriptor	{
 	unsigned sd_lolimit:16 ;	/* segment extent (lsb) */
-	unsigned sd_lobase:24 __attribute__ ((packed));
-					/* segment base address (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 */
@@ -180,8 +178,8 @@
  * region descriptors, used to load gdt/idt tables before segments yet exist.
  */
 struct region_descriptor {
-	unsigned rd_limit:16;				/* segment extent */
-	unsigned rd_base:32 __attribute__ ((packed));	/* base address  */
+	unsigned rd_limit:16;		/* segment extent */
+	unsigned rd_base:32 __packed;	/* base address  */
 };
 
 /*

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200209230657.g8N6vFtq063135>