diff mbox

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

Message ID 1453983508-20410-1-git-send-email-broonie@kernel.org (mailing list archive)
State New, archived
Headers show

Commit Message

Mark Brown Jan. 28, 2016, 12:18 p.m. UTC
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.

Signed-off-by: Mark Brown <broonie@kernel.org>
---
 arch/arm64/include/asm/page.h | 2 ++
 1 file changed, 2 insertions(+)

Comments

Mark Brown Jan. 28, 2016, 12:44 p.m. UTC | #1
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).
Catalin Marinas Jan. 28, 2016, 2:14 p.m. UTC | #2
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__
diff mbox

Patch

diff --git a/arch/arm64/include/asm/page.h b/arch/arm64/include/asm/page.h
index 9b2f5a9d019d..9553c39e0655 100644
--- a/arch/arm64/include/asm/page.h
+++ b/arch/arm64/include/asm/page.h
@@ -19,6 +19,8 @@ 
 #ifndef __ASM_PAGE_H
 #define __ASM_PAGE_H
 
+#include <linux/personality.h>
+
 /* PAGE_SHIFT determines the page size */
 /* CONT_SHIFT determines the number of pages which can be tracked together  */
 #ifdef CONFIG_ARM64_64K_PAGES