mod_devicetable.h fixes
PATCH 1/1 mod_devicetable.h fixes
* ieee1394_device_id has kernel_ulong_t field after an odd number of__u32 ones. Since mod_devicetable.h is included both from kernel and from host build helper, we may be in trouble if we are building on 32bit host for 64bit target - userland sees unsigned long long, kernel sees unsigned long and while their sizes match, alignments might not. Fixed by forcing alignment. Fortunately, almost nobody else needs that - the rest of such fields is naturally aligned as it is.
* of_device_id has void * in it. Host userland helpers needkernel_ulong_t instead, since their void * might have nothing to do with the kernel one. Fixed in the same way it's done for similar problems in pcmcia_device_id (ifdef __KERNEL__).
* pcmcia_device_id has the same problem as ieee1394_device_id.
Fixed the same way.
----
include/linux/mod_devicetable.h +8 -2
@@ -33,7 +33,8 @@__u32 model_id;__u32 specifier_id;__u32 version; -kernel_ulong_t driver_data; + kernel_ulong_t driver_data + __attribute__((aligned(sizeof(kernel_ulong_t)))); };
@@ -182,7 +183,11 @@char name[32 ];char type[32 ];char compatible[128 ]; +#if __KERNEL__void *data; +#else +kernel_ulong_t data; +#endif };
@@ -208,7 +213,8 @@#ifdef __KERNEL__const char * prod_id[4 ];#else -kernel_ulong_t prod_id[4 ]; + kernel_ulong_t prod_id[4] + __attribute__((aligned(sizeof(kernel_ulong_t))));#endif /* not matched against */