From: Larry Finger Date: Thu, 19 Sep 2013 02:21:35 +0000 (-0500) Subject: rtlwifi: Align private space in rtl_priv struct X-Git-Tag: upstream/snapshot3+hdmi~4119^2~20^2^2~22 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=60ce314d1750fef843e9db70050e09e49f838b69;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git rtlwifi: Align private space in rtl_priv struct The private array at the end of the rtl_priv struct is not aligned. On ARM architecture, this causes an alignment trap and is fixed by aligning that array with __align(sizeof(void *)). That should properly align that space according to the requirements of all architectures. Reported-by: Jason Andrews Tested-by: Jason Andrews Signed-off-by: Larry Finger Cc: Stable Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h index cc03e7c..7032587 100644 --- a/drivers/net/wireless/rtlwifi/wifi.h +++ b/drivers/net/wireless/rtlwifi/wifi.h @@ -2057,7 +2057,7 @@ struct rtl_priv { that it points to the data allocated beyond this structure like: rtl_pci_priv or rtl_usb_priv */ - u8 priv[0]; + u8 priv[0] __aligned(sizeof(void *)); }; #define rtl_priv(hw) (((struct rtl_priv *)(hw)->priv))