Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756031AbYBWFxd (ORCPT ); Sat, 23 Feb 2008 00:53:33 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751215AbYBWFwm (ORCPT ); Sat, 23 Feb 2008 00:52:42 -0500 Received: from vs166246.vserver.de ([62.75.166.246]:52449 "EHLO vs166246.vserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751004AbYBWFwk (ORCPT ); Sat, 23 Feb 2008 00:52:40 -0500 From: Michael Buesch To: "Gordon Farquharson" Subject: Re: [RFC] [PATCH] Fix b43 driver build for arm Date: Sat, 23 Feb 2008 06:51:09 +0100 User-Agent: KMail/1.9.6 (enterprise 0.20070907.709405) Cc: "Sam Ravnborg" , "Russell King" , linux-kernel@vger.kernel.org, linville@tuxdriver.com, stefano.brivio@polimi.it, "Linus Torvalds" , "Andrew Morton" , viro@ftp.linux.org.uk References: <97a0a9ac0802181403ja79c32v864b093414b2755@mail.gmail.com> <200802221507.15871.mb@bu3sch.de> <97a0a9ac0802222034m125b43c1hda1e24f04ab0ebd3@mail.gmail.com> In-Reply-To: <97a0a9ac0802222034m125b43c1hda1e24f04ab0ebd3@mail.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200802230651.10376.mb@bu3sch.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2572 Lines: 65 On Saturday 23 February 2008, Gordon Farquharson wrote: > On Fri, Feb 22, 2008 at 7:07 AM, Michael Buesch wrote: > > On Friday 22 February 2008 05:24:32 Gordon Farquharson wrote: > > > On Wed, Feb 20, 2008 at 12:37 PM, Sam Ravnborg wrote: > > > > > > > Option 1) is the worst of the three as that can cost > > > > of many hours bug-hunting. > > > > Option 3) may seem optimal but I do not like to add more > > > > complexity to this part of the build. And really I do not > > > > know a reliable way to detech when we do cross builds anyway. > > > > > > > > Leaving us with option 2) that is simple, strighforward and harmless. > > > > > > Are you willing to sign off on and commit the patch? > > > > Only with a big fat comment added that the alignment is only needed > > because of a broken sanity check in file2alias.c. > > How about this? > > --- > > 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 > change 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 > http://lkml.org/lkml/2008/2/18/481 for discussion). > > Signed-off-by: Gordon Farquharson > > --- > > diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h > index 139d49d..93083ad 100644 > --- a/include/linux/mod_devicetable.h > +++ b/include/linux/mod_devicetable.h > @@ -351,7 +351,9 @@ struct sdio_device_id { > struct ssb_device_id { > __u16 vendor; > __u16 coreid; > - __u8 revision; > + /* Explicit padding to support cross-compilation. */ A big fat comment is something like that: /* Explicit padding to support a broken sanity check in file2alias.c. * The check will compare the size of the structure in the kernel * object file to the userspace the kernel is compiled on. * This breaks on cross-compilation. This padding is a workaround * for this. */ > + __u8 revision > + __attribute__((aligned(sizeof(__u32)))); > }; > #define SSB_DEVICE(_vendor, _coreid, _revision) \ > { .vendor = _vendor, .coreid = _coreid, .revision = _revision, } > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/