* [PATCH -mmotm] arm64: fix build for MAX_USER_VA_BITS
@ 2018-12-24 21:03 Qian Cai
2018-12-28 3:11 ` Andrew Morton
0 siblings, 1 reply; 2+ messages in thread
From: Qian Cai @ 2018-12-24 21:03 UTC (permalink / raw)
To: akpm; +Cc: will.deacon, linux-mm, linux-kernel, Qian Cai
Some code in 9b31cf493ff was lost during merging into the -mmotm tree
for some reasons,
In file included from ./arch/arm64/include/asm/processor.h:46,
from ./include/linux/rcupdate.h:43,
from ./include/linux/rculist.h:11,
from ./include/linux/pid.h:5,
from ./include/linux/sched.h:14,
from arch/arm64/kernel/asm-offsets.c:22:
./arch/arm64/include/asm/pgtable-hwdef.h:83:30: error:
'MAX_USER_VA_BITS' undeclared here (not in a function); did you mean
'MAX_USER_PRIO'?
#define PTRS_PER_PGD (1 << (MAX_USER_VA_BITS - PGDIR_SHIFT))
^~~~~~~~~~~~~~~~
./arch/arm64/include/asm/pgtable.h:442:26: note: in expansion of macro
'PTRS_PER_PGD'
extern pgd_t init_pg_dir[PTRS_PER_PGD];
^~~~~~~~~~~~
Signed-off-by: Qian Cai <cai@lca.pw>
---
arch/arm64/include/asm/memory.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h
index 1df0bb19117f..e1ec947e7c0c 100644
--- a/arch/arm64/include/asm/memory.h
+++ b/arch/arm64/include/asm/memory.h
@@ -67,6 +67,12 @@
#define KERNEL_START _text
#define KERNEL_END _end
+#ifdef CONFIG_ARM64_USER_VA_BITS_52
+#define MAX_USER_VA_BITS 52
+#else
+#define MAX_USER_VA_BITS VA_BITS
+#endif
+
/*
* Generic and tag-based KASAN require 1/8th and 1/16th of the kernel virtual
* address space for the shadow region respectively. They can bloat the stack
--
2.17.2 (Apple Git-113)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH -mmotm] arm64: fix build for MAX_USER_VA_BITS
2018-12-24 21:03 [PATCH -mmotm] arm64: fix build for MAX_USER_VA_BITS Qian Cai
@ 2018-12-28 3:11 ` Andrew Morton
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Morton @ 2018-12-28 3:11 UTC (permalink / raw)
To: Qian Cai; +Cc: will.deacon, linux-mm, linux-kernel
On Mon, 24 Dec 2018 16:03:12 -0500 Qian Cai <cai@lca.pw> wrote:
> Some code in 9b31cf493ff was lost during merging into the -mmotm tree
> for some reasons,
>
> In file included from ./arch/arm64/include/asm/processor.h:46,
> from ./include/linux/rcupdate.h:43,
> from ./include/linux/rculist.h:11,
> from ./include/linux/pid.h:5,
> from ./include/linux/sched.h:14,
> from arch/arm64/kernel/asm-offsets.c:22:
> ./arch/arm64/include/asm/pgtable-hwdef.h:83:30: error:
> 'MAX_USER_VA_BITS' undeclared here (not in a function); did you mean
> 'MAX_USER_PRIO'?
> #define PTRS_PER_PGD (1 << (MAX_USER_VA_BITS - PGDIR_SHIFT))
> ^~~~~~~~~~~~~~~~
> ./arch/arm64/include/asm/pgtable.h:442:26: note: in expansion of macro
> 'PTRS_PER_PGD'
> extern pgd_t init_pg_dir[PTRS_PER_PGD];
>
> ...
>
> --- a/arch/arm64/include/asm/memory.h
> +++ b/arch/arm64/include/asm/memory.h
> @@ -67,6 +67,12 @@
> #define KERNEL_START _text
> #define KERNEL_END _end
>
> +#ifdef CONFIG_ARM64_USER_VA_BITS_52
> +#define MAX_USER_VA_BITS 52
> +#else
> +#define MAX_USER_VA_BITS VA_BITS
> +#endif
> +
> /*
> * Generic and tag-based KASAN require 1/8th and 1/16th of the kernel virtual
> * address space for the shadow region respectively. They can bloat the stack
hm, that was presumably me getting lost in a maze of rejects. It seems
OK now.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-12-28 3:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-24 21:03 [PATCH -mmotm] arm64: fix build for MAX_USER_VA_BITS Qian Cai
2018-12-28 3:11 ` Andrew Morton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.