aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/hv/utils.h
diff options
context:
space:
mode:
authorTimo von Holtz <tvh@informatik.uni-kiel.de>2011-02-08 09:52:21 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-09 15:11:54 -0500
commit3c4a94132b78f3143ef8f63f8450d2385dafb429 (patch)
treee121e21a535e3d3090f72109d9b780a5b0276a35 /drivers/staging/hv/utils.h
parent56463de05a56b80b43d21a442cf2a6e0037762e8 (diff)
Staging: hv: replaced __attribute((packed)) with __packed
Replaced __attribute((packed)) with __packed as it's preferred Signed-off-by: Timo von Holtz <tvh@informatik.uni-kiel.de> Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv/utils.h')
-rw-r--r--drivers/staging/hv/utils.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/hv/utils.h b/drivers/staging/hv/utils.h
index 6d27d15ab52..acebbbf888b 100644
--- a/drivers/staging/hv/utils.h
+++ b/drivers/staging/hv/utils.h
@@ -43,12 +43,12 @@
43struct vmbuspipe_hdr { 43struct vmbuspipe_hdr {
44 u32 flags; 44 u32 flags;
45 u32 msgsize; 45 u32 msgsize;
46} __attribute__((packed)); 46} __packed;
47 47
48struct ic_version { 48struct ic_version {
49 u16 major; 49 u16 major;
50 u16 minor; 50 u16 minor;
51} __attribute__((packed)); 51} __packed;
52 52
53struct icmsg_hdr { 53struct icmsg_hdr {
54 struct ic_version icverframe; 54 struct ic_version icverframe;
@@ -59,26 +59,26 @@ struct icmsg_hdr {
59 u8 ictransaction_id; 59 u8 ictransaction_id;
60 u8 icflags; 60 u8 icflags;
61 u8 reserved[2]; 61 u8 reserved[2];
62} __attribute__((packed)); 62} __packed;
63 63
64struct icmsg_negotiate { 64struct icmsg_negotiate {
65 u16 icframe_vercnt; 65 u16 icframe_vercnt;
66 u16 icmsg_vercnt; 66 u16 icmsg_vercnt;
67 u32 reserved; 67 u32 reserved;
68 struct ic_version icversion_data[1]; /* any size array */ 68 struct ic_version icversion_data[1]; /* any size array */
69} __attribute__((packed)); 69} __packed;
70 70
71struct shutdown_msg_data { 71struct shutdown_msg_data {
72 u32 reason_code; 72 u32 reason_code;
73 u32 timeout_seconds; 73 u32 timeout_seconds;
74 u32 flags; 74 u32 flags;
75 u8 display_message[2048]; 75 u8 display_message[2048];
76} __attribute__((packed)); 76} __packed;
77 77
78struct heartbeat_msg_data { 78struct heartbeat_msg_data {
79 u64 seq_num; 79 u64 seq_num;
80 u32 reserved[8]; 80 u32 reserved[8];
81} __attribute__((packed)); 81} __packed;
82 82
83/* Time Sync IC defs */ 83/* Time Sync IC defs */
84#define ICTIMESYNCFLAG_PROBE 0 84#define ICTIMESYNCFLAG_PROBE 0
@@ -96,7 +96,7 @@ struct ictimesync_data{
96 u64 childtime; 96 u64 childtime;
97 u64 roundtriptime; 97 u64 roundtriptime;
98 u8 flags; 98 u8 flags;
99} __attribute__((packed)); 99} __packed;
100 100
101/* Index for each IC struct in array hv_cb_utils[] */ 101/* Index for each IC struct in array hv_cb_utils[] */
102#define HV_SHUTDOWN_MSG 0 102#define HV_SHUTDOWN_MSG 0