Skip to content

Commit f3c3762

Browse files
ctmarinaswilldeacon
authored andcommitted
arm64: Remove the ARCH_FORCE_MAX_ORDER config input prompt
Commit 34affcd ("arm64: drop ranges in definition of ARCH_FORCE_MAX_ORDER") dropped the ranges from the config entry and introduced an EXPERT condition on the input prompt instead. However, starting with defconfig (ARCH_FORCE_MAX_ORDER of 10) and setting ARM64_64K_PAGES together with EXPERT leaves MAX_ORDER 10 which fails to build in this configuration. Drop the input prompt for ARCH_FORCE_MAX_ORDER completely so that it's no longer configurable. People requiring a higher MAX_ORDER should send a patch changing the default, together with proper justification. Fixes: 34affcd ("arm64: drop ranges in definition of ARCH_FORCE_MAX_ORDER") Signed-off-by: Catalin Marinas <[email protected]> Reported-by: Marc Zyngier <[email protected]> Cc: Will Deacon <[email protected]> Cc: Mike Rapoport <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Justin M. Forbes <[email protected]> Reviewed-by: Anshuman Khandual <[email protected]> Acked-by: Marc Zyngier <[email protected]> Acked-by: Mike Rapoport (IBM) <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Will Deacon <[email protected]>
1 parent c4c597f commit f3c3762

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/arm64/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1516,7 +1516,7 @@ config XEN
15161516
# 16K | 27 | 14 | 13 | 11 |
15171517
# 64K | 29 | 16 | 13 | 13 |
15181518
config ARCH_FORCE_MAX_ORDER
1519-
int "Order of maximal physically contiguous allocations" if EXPERT && (ARM64_4K_PAGES || ARM64_16K_PAGES)
1519+
int
15201520
default "13" if ARM64_64K_PAGES
15211521
default "11" if ARM64_16K_PAGES
15221522
default "10"

0 commit comments

Comments
 (0)