From patchwork Tue Feb 2 19:39:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 8195001 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 53C359F3CD for ; Tue, 2 Feb 2016 19:42:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6F53520279 for ; Tue, 2 Feb 2016 19:42:28 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 37822202BE for ; Tue, 2 Feb 2016 19:42:27 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aQgoW-0005OU-M0; Tue, 02 Feb 2016 19:40:36 +0000 Received: from mail.linuxfoundation.org ([140.211.169.12]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aQgnS-0002uT-7T for linux-arm-kernel@lists.infradead.org; Tue, 02 Feb 2016 19:39:33 +0000 Received: from akpm3.mtv.corp.google.com (unknown [216.239.45.65]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id ADB36FEB; Tue, 2 Feb 2016 19:39:08 +0000 (UTC) Date: Tue, 2 Feb 2016 11:39:08 -0800 From: Andrew Morton To: Will Deacon Subject: Re: [PATCH] arm64: asm: Explicitly include linux/personality.h in asm/page.h Message-Id: <20160202113908.d699440a0617006c3b987129@linux-foundation.org> In-Reply-To: <20160202164817.GM10166@arm.com> References: <1453983508-20410-1-git-send-email-broonie@kernel.org> <20160128124417.GE6078@sirena.org.uk> <20160128141425.GA20099@e104818-lin.cambridge.arm.com> <20160128144610.GA2380@ulmo> <20160202164817.GM10166@arm.com> X-Mailer: Sylpheed 3.4.1 (GTK+ 2.24.23; x86_64-pc-linux-gnu) Mime-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160202_113930_765873_614B76E2 X-CRM114-Status: GOOD ( 21.50 ) X-Spam-Score: -4.2 (----) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Catalin Marinas , Mark Brown , Thierry Reding , Konstantin Khlebnikov , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Tue, 2 Feb 2016 16:48:18 +0000 Will Deacon wrote: > On Thu, Jan 28, 2016 at 03:46:10PM +0100, Thierry Reding wrote: > > On Thu, Jan 28, 2016 at 02:14:26PM +0000, Catalin Marinas wrote: > > > On Thu, Jan 28, 2016 at 12:44:17PM +0000, Mark Brown wrote: > > > > On Thu, Jan 28, 2016 at 12:18:28PM +0000, Mark Brown wrote: > > > > > asm/page.h uses READ_IMPLIES_EXEC from linux/personality.h but does not > > > > > explicitly include it causing build failures in -next where whatever was > > > > > causing it to be implicitly included has changed to remove that > > > > > inclusion. Add an explicit inclusion to fix this. > > > > > > > > Argh, sorry - this causes problems further down the line with linking > > > > vdso.lds due to enums getting into the linker script and upsetting the > > > > linker (there are several compile errors today so it was masked). > > > > > > You can move the include further down after the #ifndef __ASSEMBLY__ > > > > Indeed, here's what I've been using to successfully complete ARM64 test > > builds: > > > > --- >8 --- > > diff --git a/arch/arm64/include/asm/page.h b/arch/arm64/include/asm/page.h > > index 9b2f5a9d019d..ae615b9d9a55 100644 > > --- a/arch/arm64/include/asm/page.h > > +++ b/arch/arm64/include/asm/page.h > > @@ -39,6 +39,7 @@ > > > > #ifndef __ASSEMBLY__ > > > > +#include /* for READ_IMPLIES_EXEC */ > > #include > > > > extern void __cpu_clear_user_page(void *p, unsigned long user); > > I see this has ended up in linux-next, but I'm not sure whether or not > it's actually queued someplace for 4.6. Any ideas? > > If not, I can take it (or some derivative) through arm64 as a fix for > -rc3. It's not actually needed any more because Kirill has tweaked the patch which triggered this build error. However I think the change still makes sense as a standalone thing - your call. From: Andrew Morton Subject: arm: arch/arm/include/asm/page.h needs personality.h VM_DATA_DEFAULT_FLAGS uses READ_IMPLIES_EXEC, so page.h should include personality.h to provide this. This was needed for "mm: warn about VmData over RLIMIT_DATA". Cc: Russell King Cc: Will Deacon Cc: Konstantin Khlebnikov Signed-off-by: Andrew Morton --- arch/arm/include/asm/page.h | 2 ++ 1 file changed, 2 insertions(+) diff -puN arch/arm/include/asm/page.h~arm-arch-arm-include-asm-pageh-needs-personalityh arch/arm/include/asm/page.h --- a/arch/arm/include/asm/page.h~arm-arch-arm-include-asm-pageh-needs-personalityh +++ a/arch/arm/include/asm/page.h @@ -17,6 +17,8 @@ #ifndef __ASSEMBLY__ +#include /* For READ_IMPLIES_EXEC */ + #ifndef CONFIG_MMU #include