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

[Petr Salinger]

Author: ps-guest
Date: 2006-11-13 14:06:19 +0100 (Mon, 13 Nov 2006)
New Revision: 1719

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/023_packed.diff
Log:
* __packed -> __attribute__((__packed__)) fixes
  needed by smartmontools, parted



Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2006-11-11 15:20:33 UTC (rev 1718)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2006-11-13 13:06:19 UTC (rev 1719)
@@ -1,3 +1,10 @@
+kfreebsd-kernel-headers (0.21) UNRELEASED; urgency=low
+
+  [ Petr Salinger ]
+  * fix <sys/ata.h>, needed by smartmontools
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue,  5 Sep 2006 01:04:45 +0200
+
 kfreebsd-kernel-headers (0.20) unreleased; urgency=low
 
   [ Petr Salinger ]

Modified: trunk/kfreebsd-kernel-headers/debian/patches/023_packed.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/023_packed.diff	2006-11-11 15:20:33 UTC (rev 1718)
+++ trunk/kfreebsd-kernel-headers/debian/patches/023_packed.diff	2006-11-13 13:06:19 UTC (rev 1719)
@@ -170,4 +170,44 @@
 +} __attribute__ ((packed));
  
  #define IEEE80211_CHALLENGE_LEN		128
+
+--- sys/sys/ata.h.ORIG	2006-11-13 14:13:49.000000000 +0100
++++ sys/sys/ata.h	2006-11-13 14:15:39.000000000 +0100
+@@ -157,7 +157,7 @@
+ #define ATA_SUPPORT_FLUSHCACHE48        0x2000
  
+ /*084/087*/ u_int16_t   extension;
+-	} __packed support, enabled;
++	} __attribute__((__packed__)) support, enabled;
+ 
+ /*088*/ u_int16_t       udmamodes;              /* UltraDMA modes */
+ /*089*/ u_int16_t       erase_time;
+@@ -188,7 +188,7 @@
+ /*176*/ u_int16_t       media_serial[30];
+ 	u_int16_t       reserved206[49];
+ /*255*/ u_int16_t       integrity;
+-} __packed;
++} __attribute__((__packed__));
+ 
+ 
+ /* ATA transfer modes */
+@@ -389,7 +389,7 @@
+ 	
+     u_int8_t	specific1;		/* sense key specific */
+     u_int8_t	specific2;		/* sense key specific */
+-} __packed;
++} __attribute__((__packed__));
+ 
+ struct ata_ioc_request {
+     union {
+--- sys/dev/ata/atapi-cd.h~	2006-11-13 14:31:42.000000000 +0100
++++ sys/dev/ata/atapi-cd.h	2006-11-13 14:31:42.000000000 +0100
+@@ -266,7 +266,7 @@
+     u_int8_t    vendor_specific_byte1;
+     u_int8_t    vendor_specific_byte2;
+     u_int8_t    vendor_specific_byte3;
+-} __packed;
++} __attribute__((__packed__));
+ 
+ /* CDROM Read Track Information structure */
+ struct acd_track_info {