diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2013-09-18 21:21:35 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-13 14:51:08 -0700 |
| commit | d3f0cca5d5a167a7e154a7e4065f7e858539df4c (patch) | |
| tree | a2ea540ce4f53da8bbffad9c92e315c3c9b9c940 /drivers | |
| parent | 6a89ff9ebd1f81f6449b4c3c7a5e8861a0a6edf1 (diff) | |
| download | kernel_samsung_smdk4412-d3f0cca5d5a167a7e154a7e4065f7e858539df4c.zip kernel_samsung_smdk4412-d3f0cca5d5a167a7e154a7e4065f7e858539df4c.tar.gz kernel_samsung_smdk4412-d3f0cca5d5a167a7e154a7e4065f7e858539df4c.tar.bz2 | |
rtlwifi: Align private space in rtl_priv struct
commit 60ce314d1750fef843e9db70050e09e49f838b69 upstream.
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 <jasona@cadence.com>
Tested-by: Jason Andrews <jasona@cadence.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/wifi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h index 693395e..2e3daea 100644 --- a/drivers/net/wireless/rtlwifi/wifi.h +++ b/drivers/net/wireless/rtlwifi/wifi.h @@ -1587,7 +1587,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)) |