* [PATCH] arm64: asm: Explicitly include linux/personality.h in asm/page.h @ 2016-01-28 12:18 Mark Brown 2016-01-28 12:44 ` Mark Brown 0 siblings, 1 reply; 6+ messages in thread From: Mark Brown @ 2016-01-28 12:18 UTC (permalink / raw) To: linux-arm-kernel 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(+) 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 -- 2.7.0.rc3 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] arm64: asm: Explicitly include linux/personality.h in asm/page.h 2016-01-28 12:18 [PATCH] arm64: asm: Explicitly include linux/personality.h in asm/page.h Mark Brown @ 2016-01-28 12:44 ` Mark Brown 2016-01-28 14:14 ` Catalin Marinas 0 siblings, 1 reply; 6+ messages in thread From: Mark Brown @ 2016-01-28 12:44 UTC (permalink / raw) To: linux-arm-kernel 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). -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 473 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160128/30ed13da/attachment.sig> ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] arm64: asm: Explicitly include linux/personality.h in asm/page.h 2016-01-28 12:44 ` Mark Brown @ 2016-01-28 14:14 ` Catalin Marinas 2016-01-28 14:46 ` Thierry Reding 0 siblings, 1 reply; 6+ messages in thread From: Catalin Marinas @ 2016-01-28 14:14 UTC (permalink / raw) To: linux-arm-kernel 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__ -- Catalin ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] arm64: asm: Explicitly include linux/personality.h in asm/page.h 2016-01-28 14:14 ` Catalin Marinas @ 2016-01-28 14:46 ` Thierry Reding 2016-02-02 16:48 ` Will Deacon 0 siblings, 1 reply; 6+ messages in thread From: Thierry Reding @ 2016-01-28 14:46 UTC (permalink / raw) To: linux-arm-kernel 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> ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] arm64: asm: Explicitly include linux/personality.h in asm/page.h 2016-01-28 14:46 ` Thierry Reding @ 2016-02-02 16:48 ` Will Deacon 2016-02-02 19:39 ` Andrew Morton 0 siblings, 1 reply; 6+ messages in thread From: Will Deacon @ 2016-02-02 16:48 UTC (permalink / raw) To: linux-arm-kernel 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 <linux/personality.h> /* for READ_IMPLIES_EXEC */ > #include <asm/pgtable-types.h> > > 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. Will ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] arm64: asm: Explicitly include linux/personality.h in asm/page.h 2016-02-02 16:48 ` Will Deacon @ 2016-02-02 19:39 ` Andrew Morton 0 siblings, 0 replies; 6+ messages in thread From: Andrew Morton @ 2016-02-02 19:39 UTC (permalink / raw) To: linux-arm-kernel On Tue, 2 Feb 2016 16:48:18 +0000 Will Deacon <will.deacon@arm.com> 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 <linux/personality.h> /* for READ_IMPLIES_EXEC */ > > #include <asm/pgtable-types.h> > > > > 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 <akpm@linux-foundation.org> 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 <linux@arm.linux.org.uk> Cc: Will Deacon <will.deacon@arm.com> Cc: Konstantin Khlebnikov <koct9i@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> --- 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 <linux/personality.h> /* For READ_IMPLIES_EXEC */ + #ifndef CONFIG_MMU #include <asm/page-nommu.h> _ ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-02-02 19:39 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-01-28 12:18 [PATCH] arm64: asm: Explicitly include linux/personality.h in asm/page.h Mark Brown 2016-01-28 12:44 ` Mark Brown 2016-01-28 14:14 ` Catalin Marinas 2016-01-28 14:46 ` Thierry Reding 2016-02-02 16:48 ` Will Deacon 2016-02-02 19:39 ` Andrew Morton
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).