aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRabin Vincent <rabin@rab.in>2011-04-27 11:37:28 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-03 13:09:32 -0400
commit139540170d9d9b7ead3caaf540f161756b356d56 (patch)
tree2c7f5eca86ac5d475438a80bc427d63bbd6dd341
parent14be249c969817e05c4f1ce042906e1c5be68873 (diff)
USB: ehci: remove structure packing from ehci_def
As pointed out by Arnd Bergmann, in include/linux/usb/ehci_def.h, struct ehci_caps is defined with __attribute__((packed)) for no good reason, and this triggers undefined behaviour when using ARM's readl() on pointers to elements of this structure: http://lkml.kernel.org/r/201102021700.20683.arnd@arndb.de The same problem exists with the other two structures in ehci_def.h too, so remove the __attribute__((packed)) from all of them. Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Rabin Vincent <rabin@rab.in> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--include/linux/usb/ehci_def.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/usb/ehci_def.h b/include/linux/usb/ehci_def.h
index e49dfd45baa4..78799432008e 100644
--- a/include/linux/usb/ehci_def.h
+++ b/include/linux/usb/ehci_def.h
@@ -52,7 +52,7 @@ struct ehci_caps {
52#define HCC_PGM_FRAMELISTLEN(p) ((p)&(1 << 1)) /* true: periodic_size changes*/ 52#define HCC_PGM_FRAMELISTLEN(p) ((p)&(1 << 1)) /* true: periodic_size changes*/
53#define HCC_64BIT_ADDR(p) ((p)&(1)) /* true: can use 64-bit addr */ 53#define HCC_64BIT_ADDR(p) ((p)&(1)) /* true: can use 64-bit addr */
54 u8 portroute[8]; /* nibbles for routing - offset 0xC */ 54 u8 portroute[8]; /* nibbles for routing - offset 0xC */
55} __attribute__ ((packed)); 55};
56 56
57 57
58/* Section 2.3 Host Controller Operational Registers */ 58/* Section 2.3 Host Controller Operational Registers */
@@ -150,7 +150,7 @@ struct ehci_regs {
150#define PORT_CSC (1<<1) /* connect status change */ 150#define PORT_CSC (1<<1) /* connect status change */
151#define PORT_CONNECT (1<<0) /* device connected */ 151#define PORT_CONNECT (1<<0) /* device connected */
152#define PORT_RWC_BITS (PORT_CSC | PORT_PEC | PORT_OCC) 152#define PORT_RWC_BITS (PORT_CSC | PORT_PEC | PORT_OCC)
153} __attribute__ ((packed)); 153};
154 154
155#define USBMODE 0x68 /* USB Device mode */ 155#define USBMODE 0x68 /* USB Device mode */
156#define USBMODE_SDIS (1<<3) /* Stream disable */ 156#define USBMODE_SDIS (1<<3) /* Stream disable */
@@ -194,7 +194,7 @@ struct ehci_dbg_port {
194 u32 data47; 194 u32 data47;
195 u32 address; 195 u32 address;
196#define DBGP_EPADDR(dev, ep) (((dev)<<8)|(ep)) 196#define DBGP_EPADDR(dev, ep) (((dev)<<8)|(ep))
197} __attribute__ ((packed)); 197};
198 198
199#ifdef CONFIG_EARLY_PRINTK_DBGP 199#ifdef CONFIG_EARLY_PRINTK_DBGP
200#include <linux/init.h> 200#include <linux/init.h>