arm64: Clean config usages for page size (755e70b7) · Commits · 戴 / test

We use !CONFIG_ARM64_64K_PAGES for CONFIG_ARM64_4K_PAGES (and vice versa) in code. It all worked well, so far since we only had two options. Now, with the introduction of 16K, these cases will break. This patch cleans up the code to use the required CONFIG symbol expression without the assumption that !64K => 4K (and vice versa) Cc: Will Deacon <will.deacon@arm.com> Acked-by:

Mark Rutland <mark.rutland@arm.com> Signed-off-by:

Suzuki K. Poulose <suzuki.poulose@arm.com> Reviewed-by:

Ard Biesheuvel <ard.biesheuvel@linaro.org> Tested-by:

Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by:

Catalin Marinas <catalin.marinas@arm.com>

arch/arm64/Kconfig

+2 −2

Original line number	Diff line number	Diff line
		@@ -466,7 +466,7 @@ config ARCH_WANT_GENERAL_HUGETLB
		def_bool y

		config ARCH_WANT_HUGE_PMD_SHARE
		def_bool y if !ARM64_64K_PAGES
		def_bool y if ARM64_4K_PAGES

		config HAVE_ARCH_TRANSPARENT_HUGEPAGE
		def_bool y
		@@ -678,7 +678,7 @@ source "fs/Kconfig.binfmt"

		config COMPAT
		bool "Kernel support for 32-bit EL0"
		depends on !ARM64_64K_PAGES \|\| EXPERT
		depends on ARM64_4K_PAGES \|\| EXPERT
		select COMPAT_BINFMT_ELF
		select HAVE_UID16
		select OLD_SIGSUSPEND3

arch/arm64/Kconfig.debug

+1 −1

Original line number	Diff line number	Diff line
		@@ -77,7 +77,7 @@ config DEBUG_RODATA
		If in doubt, say Y

		config DEBUG_ALIGN_RODATA
		depends on DEBUG_RODATA && !ARM64_64K_PAGES
		depends on DEBUG_RODATA && ARM64_4K_PAGES
		bool "Align linker sections up to SECTION_SIZE"
		help
		If this option is enabled, sections that may potentially be marked as

arch/arm64/include/asm/thread_info.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@

		#include <linux/compiler.h>

		#ifndef CONFIG_ARM64_64K_PAGES
		#ifdef CONFIG_ARM64_4K_PAGES
		#define THREAD_SIZE_ORDER 2
		#endif

Admin message