From: David Kershner Date: Tue, 13 Oct 2015 15:37:23 +0000 (-0400) Subject: staging: unisys: vmcallinterface.h: convert pragma to __packed X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c3248fef2abc1dcaefc62b52766865a6a09e8c57;p=openwrt%2Fstaging%2Fblogic.git staging: unisys: vmcallinterface.h: convert pragma to __packed Convert from pragma to __packed Signed-off-by: David Kershner Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/unisys/visorbus/vmcallinterface.h b/drivers/staging/unisys/visorbus/vmcallinterface.h index 7a18aa8ee4da..c8d8483bd4df 100644 --- a/drivers/staging/unisys/visorbus/vmcallinterface.h +++ b/drivers/staging/unisys/visorbus/vmcallinterface.h @@ -82,9 +82,6 @@ enum vmcall_monitor_interface_method_tuple { /* VMCALL identification tuples */ /* Structures for IO VMCALLs */ -/* ///////////// BEGIN PRAGMA PACK PUSH 1 ///////////////////////// */ -/* ///////////// ONLY STRUCT TYPE SHOULD BE BELOW */ -#pragma pack(push, 1) /* Parameters to VMCALL_IO_CONTROLVM_ADDR interface */ struct vmcall_io_controlvm_addr_params { /* The Guest-relative physical address of the ControlVm channel. @@ -94,9 +91,6 @@ struct vmcall_io_controlvm_addr_params { * in with the appropriate address. */ u32 channel_bytes; /* contents provided by this VMCALL (OUT) */ u8 unused[4]; /* Unused Bytes in the 64-Bit Aligned Struct */ -}; - -#pragma pack(pop) -/* ///////////// END PRAGMA PACK PUSH 1 /////////////////////////// */ +} __packed; #endif /* __IOMONINTF_H__ */