From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mailapp01.imgtec.com ([195.59.15.196]:35158 "EHLO imgpgp01.kl.imgtec.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750740AbcBWJvK (ORCPT ); Tue, 23 Feb 2016 04:51:10 -0500 Date: Tue, 23 Feb 2016 09:51:07 +0000 From: James Hogan Subject: Re: [PATCH v2 2/2] kbuild: Remove stale asm-generic wrappers Message-ID: <20160223095107.GC21143@jhogan-linux.le.imgtec.org> References: <1453210670-12596-1-git-send-email-james.hogan@imgtec.com> <1667268.iM977TQnEK@wuerfel> <20160119142213.GA12679@jhogan-linux.le.imgtec.org> <4206493.gjdgtfndZ8@wuerfel> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="4ZLFUWh1odzi/v6L" Content-Disposition: inline In-Reply-To: <4206493.gjdgtfndZ8@wuerfel> Sender: linux-kbuild-owner@vger.kernel.org List-ID: To: Michal Marek Cc: Arnd Bergmann , linux-kernel@vger.kernel.org, Heinrich Schuchardt , Ralf Baechle , Paul Burton , Florian Fainelli , linux-kbuild@vger.kernel.org, linux-arch@vger.kernel.org, linux-mips@linux-mips.org --4ZLFUWh1odzi/v6L Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Michal, On Tue, Jan 19, 2016 at 03:27:24PM +0100, Arnd Bergmann wrote: > On Tuesday 19 January 2016 14:22:13 James Hogan wrote: > > On Tue, Jan 19, 2016 at 03:09:14PM +0100, Arnd Bergmann wrote: > > > On Tuesday 19 January 2016 13:37:50 James Hogan wrote: > > > > When a header file is removed from generic-y (often accompanied by = the > > > > addition of an arch specific header), the generated wrapper file wi= ll > > > > persist, and in some cases may still take precedence over the new a= rch > > > > header. > > > >=20 > > > > For example commit f1fe2d21f4e1 ("MIPS: Add definitions for extended > > > > context") removed ucontext.h from generic-y in arch/mips/include/as= m/, > > > > and added an arch/mips/include/uapi/asm/ucontext.h. The continued u= se of > > > > the wrapper when reusing a dirty build tree resulted in build failu= res > > > > in arch/mips/kernel/signal.c: > > > >=20 > > > > arch/mips/kernel/signal.c: In function =E2=80=98sc_to_extcontext=E2= =80=99: > > > > arch/mips/kernel/signal.c:142:12: error: =E2=80=98struct ucontext= =E2=80=99 has no member named =E2=80=98uc_extcontext=E2=80=99 > > > > return &uc->uc_extcontext; > > > > ^ > > > >=20 > > > > Fix by detecting and removing wrapper headers in generated header > > > > directories that do not correspond to a filename in generic-y, genh= dr-y, > > > > or the newly introduced generated-y. > > >=20 > > > Good idea. > > >=20 > > > Acked-by: Arnd Bergmann > >=20 > > Thanks Arnd > >=20 > > > Can you merge this through the mips tree, or do you need me to pick it > > > up through asm-generic? > >=20 > > I was envisaging the kbuild tree tbh, but I don't really mind how it > > gets merged. This patch depends on patch 1, which adds generated-y to > > x86 so we don't delete their other generated headers, but other than > > that it doesn't really have any dependencies. >=20 > Ok, the kbuild tree works fine too, and I guess the x86 tree would > also be fine if that helps avoid the dependency. Were you okay to take these patches, or would you prefer they go via the MIPS tree? Thanks James --4ZLFUWh1odzi/v6L Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWzCuLAAoJEGwLaZPeOHZ6y0QQAJL67+KgctHHDL1wPNksjxaR fvBuO401HDcxEG3gSlbFHYseQoUoamOO/VnMOJuExDdI7Ni4smf3RLZSNCtq4Z3a KmGIQKwUfqfZqaQUCqwSUM84wd5ZravahegTLiIO1eQD+KZAIJ1GJACm0i+PCf3R FlhvoFaszx1wbPB9IquNJ56EEq+KW0UrmLdRBaJ8l1h1BKU5yKRNHWToQ8Y5c9wn zrW59Rdo6ApU38KKjueycEw/vV4PUl0V3sd+TUhaFTNfnHvqyrEoq3UWPxYD/NFI 6xlkuwj5zw9pDRhSDQ/garAUBXxnzlSCs3ckp6Qn3zqXFbQfVVRYuifUVe6+2Ghw Lo23XwXO1785ctY6Ucqbn+ayn+fJrp1HMDPSSh48njX/2pZzqRG6bCf2V7Y9nqmR xelqodsIgBQLwaLhc2GHWCsomYC2nmyuWYc+62ejKWaJlZPzWcyPORqs6fbXrUKl 8wU1i9DcbyyPae2yMXb5U55vtLpk6s0ZJgA5eXnGGeWj6a6dm+9gXHvo+hEriWNG ZhrDni2JPVDm5NzlpModcNEmeeRFSgJpe/+UVhP9krpQ8ehKxJybYToAQbUEug/i Onzk6FlkFiLiOmJPUBsoDC0hWD0mAZ9cPEvPwxTPEeqq6bMi+MO7SCiTkTvB9P9u q6ObpxlafO+ioYNFdHa8 =zDnk -----END PGP SIGNATURE----- --4ZLFUWh1odzi/v6L--