use __packed.

1 files changed, 41 insertions, 41 deletions

diff --git a/sys/dev/aac/aacreg.h b/sys/dev/aac/aacreg.h
index 17c85b8..cf2c13f 100644
--- a/sys/dev/aac/aacreg.h
+++ b/sys/dev/aac/aacreg.h
@@ -84,7 +84,7 @@
 struct aac_queue_entry {
 	u_int32_t	aq_fib_size;	/* FIB size in bytes */
 	u_int32_t	aq_fib_addr;	/* receiver-space address of the FIB */
-} __attribute__ ((packed));
+} __packed;
 
 #define AAC_PRODUCER_INDEX	0
 #define AAC_CONSUMER_INDEX	1
@@ -106,7 +106,7 @@ struct aac_queue_table {
 	struct aac_queue_entry qt_HostHighRespQueue[AAC_HOST_HIGH_RESP_ENTRIES];
 	struct aac_queue_entry qt_AdapNormRespQueue[AAC_ADAP_NORM_RESP_ENTRIES];
 	struct aac_queue_entry qt_AdapHighRespQueue[AAC_ADAP_HIGH_RESP_ENTRIES];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Queue names
@@ -130,7 +130,7 @@ struct aac_queue_table {
 struct aac_fib_list_entry {
 	struct fib_list_entry	*Flink;
 	struct fib_list_entry	*Blink;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * FIB (FSA Interface Block?); this is the datastructure passed between the host
@@ -153,14 +153,14 @@ struct aac_fib_header {
 		} _s;
 		struct aac_fib_list_entry FibLinks;
 	} _u;
-} __attribute__ ((packed));
+} __packed;
 
 #define AAC_FIB_DATASIZE	(512 - sizeof(struct aac_fib_header))
 
 struct aac_fib {
 	struct aac_fib_header	Header;
 	u_int8_t			data[AAC_FIB_DATASIZE];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * FIB commands
@@ -282,7 +282,7 @@ struct aac_adapter_init {
 	u_int32_t	PrintfBufferSize;
 	u_int32_t	HostPhysMemPages;
 	u_int32_t	HostElapsedSeconds;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Shared data types
@@ -337,12 +337,12 @@ typedef enum {
 struct aac_sg_entry {
 	u_int32_t	SgAddress;
 	u_int32_t	SgByteCount;
-} __attribute__ ((packed));
+} __packed;
 
 struct aac_sg_table {
 	u_int32_t		SgCount;
 	struct aac_sg_entry	SgEntry[0];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Host-side scatter/gather list for 64-bit commands.
@@ -352,7 +352,7 @@ struct aac_sg_table64 {
 	u_int8_t	SgSectorsPerPage;
 	u_int16_t	SgByteOffset;
 	u_int64_t	SgEntry[0];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Container creation data
@@ -368,7 +368,7 @@ struct aac_container_creation {
 	u_int32_t	Minute:6;	/* 0-59 */
 	u_int32_t	Second:6;	/* 0-59 */
 	u_int64_t	ViaAdapterSerialNumber;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Revision number handling
@@ -397,7 +397,7 @@ struct FsaRevision {
 		u_int32_t	ul;
 	} external;
 	u_int32_t	buildNumber;
-}  __attribute__ ((packed));
+}  __packed;
 
 /*
  * Adapter Information
@@ -512,7 +512,7 @@ struct aac_adapter_info {
 	u_int32_t		SupportedOptions; /* supported features of this
 						   * controller */
 	AAC_OemFlavor	OemVariant;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Monitor/Kernel interface.
@@ -594,7 +594,7 @@ struct aac_nvramdevinfo {
 	u_int32_t	NV_NDirty;	/* count of dirty NVRAM buffers */
 	u_int32_t	NV_NActive;	/* count of NVRAM buffers being
 					 * written */
-} __attribute__ ((packed));
+} __packed;
 
 struct aac_nvraminfo {
 	AAC_NVSTATUS		NV_Status;	/* nvram subsystem status */
@@ -614,7 +614,7 @@ struct aac_nvraminfo {
 	u_int32_t		NV_BattNeedsReconditioning;	/* boolean */
 	u_int32_t		NV_TotalSize;	/* size of all non-volatile
 						 * memories in bytes */
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Data types relating to adapter-initiated FIBs
@@ -675,7 +675,7 @@ typedef enum {
 struct aac_AifContainers {
 	u_int32_t	src;		/* from/master */
 	u_int32_t	dst;		/* to/slave */
-} __attribute__ ((packed));
+} __packed;
 
 union aac_AifJobClient {
 	struct aac_AifContainers	container;	/* For Container and
@@ -691,7 +691,7 @@ struct aac_AifJobDesc {
 	AAC_AifJobType		type;		/* Operation that is being
 						 * performed */
 	union aac_AifJobClient	client;		/* Details */
-} __attribute__ ((packed));
+} __packed;
 
 struct aac_AifJobProgressReport {
 	struct aac_AifJobDesc	jd;
@@ -700,7 +700,7 @@ struct aac_AifJobProgressReport {
 	u_int32_t		currentTick;
 	u_int32_t		jobSpecificData1;
 	u_int32_t		jobSpecificData2;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Event Notification
@@ -736,46 +736,46 @@ typedef enum {
 
 struct aac_AifEnsGeneric {
 	char	text[132];		/* Generic text */
-} __attribute__ ((packed));
+} __packed;
 
 struct aac_AifEnsDeviceFailure {
 	u_int32_t	deviceHandle;	/* SCSI device handle */
-} __attribute__ ((packed));
+} __packed;
 
 struct aac_AifEnsMirrorFailover {
 	u_int32_t	container;	/* Container with failed element */
 	u_int32_t	failedSlice;	/* Old slice which failed */
 	u_int32_t	creatingSlice;	/* New slice used for auto-create */
-} __attribute__ ((packed));
+} __packed;
 
 struct aac_AifEnsContainerChange {
 	u_int32_t	container[2];	/* container that changed, -1 if no
 					 * container */
-} __attribute__ ((packed));
+} __packed;
 
 struct aac_AifEnsContainerEvent {
 	u_int32_t	container;	/* container number  */
 	u_int32_t	eventType;	/* event type */
-} __attribute__ ((packed));
+} __packed;
 
 struct aac_AifEnsEnclosureEvent {
 	u_int32_t	empID;		/* enclosure management proc number  */
 	u_int32_t	unitID;		/* unitId, fan id, power supply id,
 					 * slot id, tempsensor id.  */
 	u_int32_t	eventType;	/* event type */
-} __attribute__ ((packed));
+} __packed;
 
 struct aac_AifEnsBatteryEvent {
 	AAC_NVBATT_TRANSITION	transition_type;	/* eg from low to ok */
 	AAC_NVBATTSTATUS	current_state;		/* current batt state */
 	AAC_NVBATTSTATUS	prior_state;		/* prev batt state */
-} __attribute__ ((packed));
+} __packed;
 
 struct aac_AifEnsDiskSetEvent {
 	u_int32_t	eventType;
 	u_int64_t	DsNum;
 	u_int64_t	CreatorId;
-} __attribute__ ((packed));
+} __packed;
 
 typedef enum {
 	CLUSTER_NULL_EVENT = 0,
@@ -789,7 +789,7 @@ typedef enum {
 
 struct aac_AifEnsClusterEvent {
 	AAC_ClusterAifEvent	eventType;
-} __attribute__ ((packed));
+} __packed;
 
 struct aac_AifEventNotify {
 	AAC_AifEventNotifyType	type;
@@ -805,7 +805,7 @@ struct aac_AifEventNotify {
 /*		struct aac_AifEnsSMARTEvent		ES;*/
 		struct aac_AifEnsClusterEvent		ECLE;
 	} data;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Adapter Initiated FIB command structures. Start with the adapter
@@ -842,7 +842,7 @@ struct aac_aif_command {
 	struct aac_AifJobProgressReport	PR[1];	/* Progress report */
 	u_int8_t			AR[AAC_AIF_REPORT_MAX_SIZE];
 	} data;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Filesystem commands/data
@@ -978,20 +978,20 @@ struct aac_mntobj {
 		u_int32_t	pad[8];
 	} ObjExtension;
 	u_int32_t			AlterEgoId;
-} __attribute__ ((packed));
+} __packed;
 
 struct aac_mntinfo {
 	AAC_VMCommand		Command;
 	AAC_FType		MntType;
 	u_int32_t		MntCount;
-} __attribute__ ((packed));
+} __packed;
 
 struct aac_mntinforesp {
 	AAC_FSAStatus		Status;
 	AAC_FType		MntType;
 	u_int32_t		MntRespCount;
 	struct aac_mntobj	MntTable[1];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Container shutdown command.
@@ -999,7 +999,7 @@ struct aac_mntinforesp {
 struct aac_closecommand {
 	u_int32_t	Command;
 	u_int32_t	ContainerId;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Container Config Command
@@ -1009,13 +1009,13 @@ struct aac_ctcfg {
 	AAC_VMCommand		Command;
 	u_int32_t		cmd;
 	u_int32_t		param;
-} __attribute__ ((packed));
+} __packed;
 
 struct aac_ctcfg_resp {
 	AAC_FSAStatus		Status;
 	u_int32_t		resp;
 	u_int32_t		param;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * 'Ioctl' commads
@@ -1033,7 +1033,7 @@ struct aac_getbusinf {
 	u_int32_t		TargetsPerBus;
 	u_int8_t		InitiatorBusId[AAC_SCSI_MAX_PORTS];
 	u_int8_t		BusValid[AAC_SCSI_MAX_PORTS];
-} __attribute__ ((packed));
+} __packed;
 
 struct aac_vmioctl {
 	AAC_VMCommand		Command;
@@ -1042,7 +1042,7 @@ struct aac_vmioctl {
 	u_int32_t		ObjId;
 	u_int32_t		IoctlCmd;
 	u_int32_t		IoctlBuf[1];	/* Placeholder? */
-} __attribute__ ((packed));
+} __packed;
 
 struct aac_vmi_businf_resp {
 	AAC_FSAStatus		Status;
@@ -1051,7 +1051,7 @@ struct aac_vmi_businf_resp {
 	u_int32_t		ObjId;
 	u_int32_t		IoctlCmd;
 	struct aac_getbusinf	BusInf;
-} __attribute__ ((packed));
+} __packed;
 
 #define AAC_BTL_TO_HANDLE(b, t, l) \
     (((b & 0x3f) << 7) | ((l & 0x7) << 4) | (t & 0xf))
@@ -1130,12 +1130,12 @@ struct aac_blockread {
 	u_int32_t		BlockNumber;
 	u_int32_t		ByteCount;
 	struct aac_sg_table	SgMap;		/* variable size */
-} __attribute__ ((packed));
+} __packed;
 
 struct aac_blockread_response {
 	AAC_FSAStatus		Status;
 	u_int32_t		ByteCount;
-} __attribute__ ((packed));
+} __packed;
 
 struct aac_blockwrite {
 	AAC_VMCommand		Command;	/* not FSACommand! */
@@ -1144,13 +1144,13 @@ struct aac_blockwrite {
 	u_int32_t		ByteCount;
 	AAC_CacheLevel	Stable;
 	struct aac_sg_table	SgMap;		/* variable size */
-} __attribute__ ((packed));
+} __packed;
 
 struct aac_blockwrite_response {
 	AAC_FSAStatus	Status;
 	u_int32_t		ByteCount;
 	AAC_CommitLevel	Committed;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Container shutdown command.