Commit 855f9a8e authored by Anshuman Khandual's avatar Anshuman Khandual Committed by Linus Torvalds
Browse files

mm: generalize SYS_SUPPORTS_HUGETLBFS (rename as ARCH_SUPPORTS_HUGETLBFS) 

SYS_SUPPORTS_HUGETLBFS config has duplicate definitions on platforms
that subscribe it.  Instead, just make it a generic option which can be
selected on applicable platforms.

Also rename it as ARCH_SUPPORTS_HUGETLBFS instead.  This reduces code
duplication and makes it cleaner.

Link: https://lkml.kernel.org/r/1617259448-22529-3-git-send-email-anshuman.khandual@arm.com


Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>	[arm64]
Acked-by: Palmer Dabbelt <palmerdabbelt@google.com>	[riscv]
Acked-by: Michael Ellerman <mpe@ellerman.id.au>		[powerpc]
Cc: Russell King <linux@armlinux.org.uk>
Cc: Will Deacon <will@kernel.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c2280be8

arch/arm/Kconfig

+1 −4
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ config ARM 
	select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX

	select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT if CPU_V7

	select ARCH_SUPPORTS_ATOMIC_RMW

	select ARCH_SUPPORTS_HUGETLBFS if ARM_LPAE

	select ARCH_USE_BUILTIN_BSWAP

	select ARCH_USE_CMPXCHG_LOCKREF

	select ARCH_USE_MEMTEST
@@ -1511,10 +1512,6 @@ config HW_PERF_EVENTS 
	def_bool y

	depends on ARM_PMU



config SYS_SUPPORTS_HUGETLBFS

       def_bool y

       depends on ARM_LPAE



config HAVE_ARCH_TRANSPARENT_HUGEPAGE

       def_bool y

       depends on ARM_LPAE

arch/arm64/Kconfig

+1 −3
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ config ARM64 
	select ARCH_USE_QUEUED_SPINLOCKS

	select ARCH_USE_SYM_ANNOTATIONS

	select ARCH_SUPPORTS_DEBUG_PAGEALLOC

	select ARCH_SUPPORTS_HUGETLBFS

	select ARCH_SUPPORTS_MEMORY_FAILURE

	select ARCH_SUPPORTS_SHADOW_CALL_STACK if CC_HAVE_SHADOW_CALL_STACK

	select ARCH_SUPPORTS_LTO_CLANG if CPU_LITTLE_ENDIAN
@@ -1072,9 +1073,6 @@ config HW_PERF_EVENTS 
	def_bool y

	depends on ARM_PMU



config SYS_SUPPORTS_HUGETLBFS

	def_bool y



config ARCH_HAS_FILTER_PGPROT

	def_bool y

arch/mips/Kconfig

+1 −5
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ config MIPS 
	select ARCH_USE_MEMTEST

	select ARCH_USE_QUEUED_RWLOCKS

	select ARCH_USE_QUEUED_SPINLOCKS

	select ARCH_SUPPORTS_HUGETLBFS if CPU_SUPPORTS_HUGEPAGES

	select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU

	select ARCH_WANT_IPC_PARSE_VERSION

	select ARCH_WANT_LD_ORPHAN_WARN
@@ -1287,11 +1288,6 @@ config SYS_SUPPORTS_BIG_ENDIAN 
config SYS_SUPPORTS_LITTLE_ENDIAN

	bool



config SYS_SUPPORTS_HUGETLBFS

	bool

	depends on CPU_SUPPORTS_HUGEPAGES

	default y



config MIPS_HUGE_TLB_SUPPORT

	def_bool HUGETLB_PAGE || TRANSPARENT_HUGEPAGE

arch/parisc/Kconfig

+1 −4
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ config PARISC 
	select ARCH_HAS_STRICT_KERNEL_RWX

	select ARCH_HAS_UBSAN_SANITIZE_ALL

	select ARCH_NO_SG_CHAIN

	select ARCH_SUPPORTS_HUGETLBFS if PA20

	select ARCH_SUPPORTS_MEMORY_FAILURE

	select DMA_OPS

	select RTC_CLASS
@@ -138,10 +139,6 @@ config PGTABLE_LEVELS 
	default 3 if 64BIT && PARISC_PAGE_SIZE_4KB

	default 2



config SYS_SUPPORTS_HUGETLBFS

	def_bool y if PA20





menu "Processor type and features"



choice

arch/powerpc/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -697,9 +697,6 @@ config ARCH_SPARSEMEM_DEFAULT 
	def_bool y

	depends on PPC_BOOK3S_64



config SYS_SUPPORTS_HUGETLBFS

	bool



config ILLEGAL_POINTER_VALUE

	hex

	# This is roughly half way between the top of user space and the bottom