[PATCH 2/3] staging: unisys: convert pack pragma to __packed

Greg KH gregkh at linuxfoundation.org
Fri Jun 12 18:08:16 UTC 2015


On Fri, Jun 12, 2015 at 01:43:33PM -0400, Benjamin Romer wrote:
> From: David Kershner <david.kershner at unisys.com>
> 
> It was noticed that iochannel.h was still using pragmas to
> pack the datastructures, should be using __packed instead.
> 
> Signed-off-by: David Kershner <david.kershner at unisys.com>
> Signed-off-by: Benjamin Romer <benjamin.romer at unisys.com>
> ---
>  drivers/staging/unisys/include/iochannel.h | 45 +++++++++++++-----------------
>  1 file changed, 20 insertions(+), 25 deletions(-)
> 
> diff --git a/drivers/staging/unisys/include/iochannel.h b/drivers/staging/unisys/include/iochannel.h
> index db7b332..1517496 100644
> --- a/drivers/staging/unisys/include/iochannel.h
> +++ b/drivers/staging/unisys/include/iochannel.h
> @@ -1,4 +1,5 @@
>  /* Copyright (C) 2010 - 2013 UNISYS CORPORATION */
> +
>  /* All rights reserved. */
>  #ifndef __IOCHANNEL_H__
>  #define __IOCHANNEL_H__
> @@ -149,22 +150,18 @@ enum vdisk_mgmt_types {
>  
>  /* structs with pragma pack  */
>  
> -#pragma pack(push, 1)
>  struct phys_info {
>  	u64 pi_pfn;
>  	u16 pi_off;
>  	u16 pi_len;
> -};
> -#pragma pack(pop)
> +} __packed;
>  /* ///////////// BEGIN PRAGMA PACK PUSH 1 ///////////////////////// */
>  /* ///////////// ONLY STRUCT TYPE SHOULD BE BELOW */

You can delete this comment now, as it's not correct anymore.



More information about the devel mailing list