Author: gordon-guest Date: Wed Feb 27 06:46:24 2008 New Revision: 10667 Log: Use patch name from -mm tree.
Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/fix-b43-driver-build-for-arm.patch Removed: dists/trunk/linux-2.6/debian/patches/bugfix/arm/pad-ssb-structure.patch Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/fix-b43-driver-build-for-arm.patch ============================================================================== --- (empty file) +++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/fix-b43-driver-build-for-arm.patch Wed Feb 27 06:46:24 2008 @@ -0,0 +1,38 @@ +From: "Gordon Farquharson" <[EMAIL PROTECTED]> + +Align the members of the SSB device structure to a 32 bit boundary so that +the b43 driver can be built for arm using a cross compiler. This alignment +is required so that the test in scripts/mod/file2alias.c that checks that +the size of the device ID type against the size of the section in the +object file succeeds (see comment and http://lkml.org/lkml/2008/2/18/481 +for explanation). + +Signed-off-by: Gordon Farquharson <[EMAIL PROTECTED]> +Cc: Russell King <[EMAIL PROTECTED]> +Acked-by: Michael Buesch <[EMAIL PROTECTED]> +Cc: "John W. Linville" <[EMAIL PROTECTED]> +Signed-off-by: Andrew Morton <[EMAIL PROTECTED]> +--- + + include/linux/mod_devicetable.h | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff -puN include/linux/mod_devicetable.h~fix-b43-driver-build-for-arm include/linux/mod_devicetable.h +--- a/include/linux/mod_devicetable.h~fix-b43-driver-build-for-arm ++++ a/include/linux/mod_devicetable.h +@@ -351,7 +351,13 @@ struct sdio_device_id { + struct ssb_device_id { + __u16 vendor; + __u16 coreid; +- __u8 revision; ++ /* Explicit padding to support a broken sanity check in file2alias.c. ++ * The check compares the size of the structure in the kernel ++ * object file to the size of the structure reported in userspace for ++ * the system on which the kernel is compiled. The check breaks on ++ * cross-compilation, and the padding is a workaround for this. */ ++ __u8 revision ++ __attribute__((aligned(sizeof(__u32)))); + }; + #define SSB_DEVICE(_vendor, _coreid, _revision) \ + { .vendor = _vendor, .coreid = _coreid, .revision = _revision, } +_ Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 ============================================================================== --- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 (original) +++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 Wed Feb 27 06:46:24 2008 @@ -30,5 +30,5 @@ + bugfix/arm/disable-r6040.patch + features/all/at76.patch + bugfix/arm/ignore-invalid-memtags.patch -+ bugfix/arm/pad-ssb-structure.patch ++ bugfix/arm/fix-b43-driver-build-for-arm.patch + bugfix/fix-hifn_795X-divdi3.patch _______________________________________________ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
