diff options
| author | Will Deacon <will.deacon@arm.com> | 2018-12-10 15:15:15 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2018-12-10 19:42:18 +0100 |
| commit | 68d23da4373aba76f5300017c4746440f276698e (patch) | |
| tree | 138b93b628cf77727970417690693f18eddf7c40 /arch/arm64/kernel/smp.c | |
| parent | arm64: mm: Allow forcing all userspace addresses to 52-bit (diff) | |
| download | linux-68d23da4373aba76f5300017c4746440f276698e.tar.xz linux-68d23da4373aba76f5300017c4746440f276698e.zip | |
arm64: Kconfig: Re-jig CONFIG options for 52-bit VA
Enabling 52-bit VAs for userspace is pretty confusing, since it requires
you to select "48-bit" virtual addressing in the Kconfig.
Rework the logic so that 52-bit user virtual addressing is advertised in
the "Virtual address space size" choice, along with some help text to
describe its interaction with Pointer Authentication. The EXPERT-only
option to force all user mappings to the 52-bit range is then made
available immediately below the VA size selection.
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/kernel/smp.c')
| -rw-r--r-- | arch/arm64/kernel/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index e15b0b64d4d0..1ff18f5fbecb 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -139,7 +139,7 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle) if (!cpu_online(cpu)) { pr_crit("CPU%u: failed to come online\n", cpu); - if (IS_ENABLED(CONFIG_ARM64_52BIT_VA) && va52mismatch) + if (IS_ENABLED(CONFIG_ARM64_USER_VA_BITS_52) && va52mismatch) pr_crit("CPU%u: does not support 52-bit VAs\n", cpu); ret = -EIO; |