[PATCH] arm64: asm: Explicitly include linux/personality.h in asm/page.h

[Thierry Reding]

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 <linux/personality.h> /* for READ_IMPLIES_EXEC */
 #include <asm/pgtable-types.h>
 
 extern void __cpu_clear_user_page(void *p, unsigned long user);
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160128/d01a1452/attachment-0001.sig>