diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2018-12-11 15:08:10 +0100 |
|---|---|---|
| committer |   Will Deacon <will.deacon@arm.com> | 2018-12-11 20:07:12 +0000 |
| commit | 4d08d20f1c94b2da5847d3f9ba6c93ae5b1520c2 (patch) | |
| tree | 6a5b0a77f3d08fd31c0d2a7b8af135527efd251e | |
| parent | arm64: preempt: Fix big-endian when checking preempt count in assembly (diff) | |
| download | linux-dev-4d08d20f1c94b2da5847d3f9ba6c93ae5b1520c2.tar.xz linux-dev-4d08d20f1c94b2da5847d3f9ba6c93ae5b1520c2.zip | |
arm64: fix ARM64_USER_VA_BITS_52 builds
In some randconfig builds, the new CONFIG_ARM64_USER_VA_BITS_52
triggered a build failure:
arch/arm64/mm/proc.S:287: Error: immediate out of range
As it turns out, we were incorrectly setting PGTABLE_LEVELS here,
lacking any other default value.
This fixes the calculation of CONFIG_PGTABLE_LEVELS to consider
all combinations again.
Fixes: 68d23da4373a ("arm64: Kconfig: Re-jig CONFIG options for 52-bit VA")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Will Deacon <will.deacon@arm.com>
| -rw-r--r-- | arch/arm64/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 4dbef530cf58..47c1f21e81dc 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -274,7 +274,7 @@ config PGTABLE_LEVELS int default 2 if ARM64_16K_PAGES && ARM64_VA_BITS_36 default 2 if ARM64_64K_PAGES && ARM64_VA_BITS_42 - default 3 if ARM64_64K_PAGES && ARM64_VA_BITS_48 + default 3 if ARM64_64K_PAGES && (ARM64_VA_BITS_48 || ARM64_USER_VA_BITS_52) default 3 if ARM64_4K_PAGES && ARM64_VA_BITS_39 default 3 if ARM64_16K_PAGES && ARM64_VA_BITS_47 default 4 if !ARM64_64K_PAGES && ARM64_VA_BITS_48 |