staging: unisys: channel.h covert from pragma to __packed

Need to convert from #pragma to __packed for channel structures.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/unisys/include/channel.h b/drivers/staging/unisys/include/channel.h
index da0b5387f884347ccd365cd7d53aa3baa1b39b75..698adeb08965c34471a2a30e64e953c3db27db04 100644 (file)
--- a/drivers/staging/unisys/include/channel.h
+++ b/drivers/staging/unisys/include/channel.h
@@ -152,7 +152,6 @@ ULTRA_CHANNELCLI_STRING(u32 v)
 #define ULTRA_IO_DRIVER_DISABLES_INTS (0x1ULL << 5)
 #define ULTRA_IO_DRIVER_SUPPORTS_ENHANCED_RCVBUF_CHECKING (0x1ULL << 6)
 
-#pragma pack(push, 1)          /* both GCC and VC now allow this pragma */
 /* Common Channel Header */
 struct channel_header {
        u64 signature;          /* Signature */
@@ -192,7 +191,7 @@ struct channel_header {
        u8 filler[1];           /* Pad out to 128 byte cacheline */
        /* Please add all new single-byte values below here */
        u8 recover_channel;
-};
+} __packed;
 
 #define ULTRA_CHANNEL_ENABLE_INTS (0x1ULL << 0)
 
@@ -230,9 +229,8 @@ struct signal_queue_header {
                                 * to denote trouble with client's
                                 * fields */
        u8 filler[12];          /* Pad out to 64 byte cacheline */
-};
+} __packed;
 
-#pragma pack(pop)
 
 #define spar_signal_init(chan, QHDRFLD, QDATAFLD, QDATATYPE, ver, typ) \
        do {                                                            \