Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / staging / hv / channel.h

diff --git a/drivers/staging/hv/channel.h b/drivers/staging/hv/channel.h
index 7997056734d7be4ef95378f08c29b3539753d2ab..de4f867de171e161cae3324cdc8fa4596b9c3038 100644 (file)
--- a/drivers/staging/hv/channel.h
+++ b/drivers/staging/hv/channel.h
@@ -37,7 +37,7 @@ struct vmbus_channel_packet_page_buffer {
        u32 reserved;
        u32 rangecount;
        struct hv_page_buffer range[MAX_PAGE_BUFFER_COUNT];
-} __attribute__((packed));
+} __packed;
 
 /* The format must be the same as struct vmdata_gpa_direct */
 struct vmbus_channel_packet_multipage_buffer {
@@ -49,7 +49,7 @@ struct vmbus_channel_packet_multipage_buffer {
        u32 reserved;
        u32 rangecount;         /* Always 1 in this case */
        struct hv_multipage_buffer range;
-} __attribute__((packed));
+} __packed;
 
 
 extern int vmbus_open(struct vmbus_channel *channel,