[Glibc-bsd-commits] r2657 - in trunk/kfreebsd-kernel-headers/debian: . patches

[Petr Salinger]

Author: ps-guest
Date: 2009-07-21 11:16:04 +0000 (Tue, 21 Jul 2009)
New Revision: 2657

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/023_packed.diff
Log:
* fix <dev/ciss/cissio.h>, needed by smartmontools.



Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2009-07-21 07:14:08 UTC (rev 2656)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2009-07-21 11:16:04 UTC (rev 2657)
@@ -1,3 +1,10 @@
+kfreebsd-kernel-headers (0.36) UNSTABLE; urgency=low
+
+  [ Petr Salinger ]
+  * fix <dev/ciss/cissio.h>, needed by smartmontools.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Fri, 03 Jul 2009 03:00:44 +0200
+
 kfreebsd-kernel-headers (0.35) unstable; urgency=low
 
   [ Petr Salinger ]

Modified: trunk/kfreebsd-kernel-headers/debian/patches/023_packed.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/023_packed.diff	2009-07-21 07:14:08 UTC (rev 2656)
+++ trunk/kfreebsd-kernel-headers/debian/patches/023_packed.diff	2009-07-21 11:16:04 UTC (rev 2657)
@@ -324,6 +324,113 @@
  
  /* CDROM Read Track Information structure */
  struct acd_track_info {
+Index: src/sys/dev/ciss/cissio.h
+===================================================================
+--- src/sys/dev/ciss/cissio.h.orig
++++ src/sys/dev/ciss/cissio.h
+@@ -108,18 +108,18 @@
+ 	u_int8_t	Dev;
+ 	u_int8_t	Bus:6;
+ 	u_int8_t	Mode:2;
+-    } __packed PeripDev;
++    } __attribute__((__packed__)) PeripDev;
+     struct {
+ 	u_int8_t	DevLSB;
+ 	u_int8_t	DevMSB:6;
+ 	u_int8_t	Mode:2;
+-    } __packed LogDev;
++    } __attribute__((__packed__)) LogDev;
+     struct {
+ 	u_int8_t	Dev:5;
+ 	u_int8_t	Bus:3;
+ 	u_int8_t	Targ:6;
+ 	u_int8_t	Mode:2;
+-    } __packed LogUnit;
++    } __attribute__((__packed__)) LogUnit;
+ } SCSI3Addr_struct;
+ 
+ typedef struct {
+@@ -127,20 +127,20 @@
+     u_int32_t		Bus:6;
+     u_int32_t		Mode:2;
+     SCSI3Addr_struct	Target[2];
+-} __packed PhysDevAddr_struct;
++} __attribute__((__packed__)) PhysDevAddr_struct;
+   
+ typedef struct {
+     u_int32_t		VolId:30;
+     u_int32_t		Mode:2;
+     u_int8_t		reserved[4];
+-} __packed LogDevAddr_struct;
++} __attribute__((__packed__)) LogDevAddr_struct;
+ 
+ typedef union {
+     u_int8_t		LunAddrBytes[8];
+     SCSI3Addr_struct	SCSI3Lun[4];
+     PhysDevAddr_struct	PhysDev;
+     LogDevAddr_struct	LogDev;
+-} __packed LUNAddr_struct;
++} __attribute__((__packed__)) LUNAddr_struct;
+ 
+ typedef struct {
+     u_int8_t	CDBLen;
+@@ -148,24 +148,24 @@
+ 	u_int8_t	Type:3;
+ 	u_int8_t	Attribute:3;
+ 	u_int8_t	Direction:2;
+-    } __packed Type;
++    } __attribute__((__packed__)) Type;
+     u_int16_t	Timeout;
+     u_int8_t	CDB[16];
+-} __packed RequestBlock_struct;
++} __attribute__((__packed__)) RequestBlock_struct;
+ 
+ typedef union {
+     struct {
+ 	u_int8_t	Reserved[3];
+ 	u_int8_t	Type;
+ 	u_int32_t	ErrorInfo;
+-    } __packed Common_Info;
++    } __attribute__((__packed__)) Common_Info;
+     struct {
+ 	u_int8_t	Reserved[2];
+ 	u_int8_t	offense_size;
+ 	u_int8_t	offense_num;
+ 	u_int32_t	offense_value;
+-    } __packed Invalid_Cmd;
+-} __packed MoreErrInfo_struct;
++    } __attribute__((__packed__)) Invalid_Cmd;
++} __attribute__((__packed__)) MoreErrInfo_struct;
+ 
+ typedef struct {
+     u_int8_t		ScsiStatus;
+@@ -174,7 +174,7 @@
+     u_int32_t		ResidualCnt;
+     MoreErrInfo_struct	MoreErrInfo;
+     u_int8_t		SenseInfo[SENSEINFOBYTES];
+-} __packed ErrorInfo_struct;
++} __attribute__((__packed__)) ErrorInfo_struct;
+ 
+ typedef struct {
+     LUNAddr_struct	LUN_info;	/* 8 */
+@@ -182,7 +182,7 @@
+     ErrorInfo_struct	error_info;	/* 48 */
+     u_int16_t		buf_size;	/* 2 */
+     u_int8_t		*buf;		/* 4 */
+-} __packed IOCTL_Command_struct;
++} __attribute__((__packed__)) IOCTL_Command_struct;
+ 
+ #ifdef __amd64__
+ typedef struct {
+@@ -191,7 +191,7 @@
+     ErrorInfo_struct	error_info;	/* 48 */
+     u_int16_t		buf_size;	/* 2 */
+     u_int32_t		buf;		/* 4 */
+-} __packed IOCTL_Command_struct32;
++} __attribute__((__packed__)) IOCTL_Command_struct32;
+ #endif
+ 
+ /*
 Index: src/sys/i386/include/segments.h
 ===================================================================
 --- src/sys/amd64/include/segments.h.orig