| From 60ce314d1750fef843e9db70050e09e49f838b69 Mon Sep 17 00:00:00 2001 |
| From: Larry Finger <Larry.Finger@lwfinger.net> |
| Date: Wed, 18 Sep 2013 21:21:35 -0500 |
| Subject: rtlwifi: Align private space in rtl_priv struct |
| |
| From: Larry Finger <Larry.Finger@lwfinger.net> |
| |
| 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> |
| |
| --- |
| drivers/net/wireless/rtlwifi/wifi.h | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- 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)) |
