mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-08-31 12:52:29 -04:00
mm/kconfig: drop redundant dependency wrappers
Some mm Kconfig entries repeat dependencies that are already expressed by their surrounding blocks or menus. The zsmalloc allocator options menu already depends on ZSMALLOC, so the outer if ZSMALLOC block does not add any extra constraint. MEMORY_HOTREMOVE and MHP_MEMMAP_ON_MEMORY are both inside the if MEMORY_HOTPLUG block, so their local depends on MEMORY_HOTPLUG entries are redundant. PTE_MARKER_UFFD_WP is the only entry under if USERFAULTFD. Move the USERFAULTFD dependency into the symbol itself and combine it with the architecture support dependency. This keeps the same visibility and defaults while avoiding duplicate dependency expressions. Link: https://lore.kernel.org/20260712093326.8313-1-kaitao.cheng@linux.dev Signed-off-by: Kaitao Cheng <chengkaitao@kylinos.cn> Suggested-by: Julian Braha <julianbraha@gmail.com> Reviewed-by: Lorenzo Stoakes (ARM) <ljs@kernel.org> Acked-by: David Hildenbrand (Arm) <david@kernel.org> Cc: Liam R. Howlett <liam@infradead.org> Cc: Michal Hocko <mhocko@suse.com> Cc: Mike Rapoport <rppt@kernel.org> Cc: Muchun Song <muchun.song@linux.dev> Cc: Suren Baghdasaryan <surenb@google.com> Cc: Vlastimil Babka <vbabka@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
committed by
Andrew Morton
parent
092836fedd
commit
0b4268ac77
10
mm/Kconfig
10
mm/Kconfig
@@ -125,8 +125,6 @@ config ZSWAP_COMPRESSOR_DEFAULT
|
||||
config ZSMALLOC
|
||||
tristate
|
||||
|
||||
if ZSMALLOC
|
||||
|
||||
menu "Zsmalloc allocator options"
|
||||
depends on ZSMALLOC
|
||||
|
||||
@@ -161,8 +159,6 @@ config ZSMALLOC_CHAIN_SIZE
|
||||
|
||||
endmenu
|
||||
|
||||
endif
|
||||
|
||||
menu "Slab allocator options"
|
||||
|
||||
config SLUB
|
||||
@@ -583,12 +579,10 @@ endchoice
|
||||
|
||||
config MEMORY_HOTREMOVE
|
||||
bool "Allow for memory hot remove"
|
||||
depends on MEMORY_HOTPLUG
|
||||
select MIGRATION
|
||||
|
||||
config MHP_MEMMAP_ON_MEMORY
|
||||
def_bool y
|
||||
depends on MEMORY_HOTPLUG
|
||||
depends on ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE
|
||||
|
||||
endif # MEMORY_HOTPLUG
|
||||
@@ -1393,17 +1387,15 @@ menuconfig USERFAULTFD
|
||||
Enable the userfaultfd() system call that allows to intercept and
|
||||
handle page faults in userland.
|
||||
|
||||
if USERFAULTFD
|
||||
config PTE_MARKER_UFFD_WP
|
||||
bool "Userfaultfd write protection support for shmem/hugetlbfs"
|
||||
default y
|
||||
depends on HAVE_ARCH_USERFAULTFD_WP
|
||||
depends on USERFAULTFD && HAVE_ARCH_USERFAULTFD_WP
|
||||
|
||||
help
|
||||
Allows to create marker PTEs for userfaultfd write protection
|
||||
purposes. It is required to enable userfaultfd write protection on
|
||||
file-backed memory types like shmem and hugetlbfs.
|
||||
endif # USERFAULTFD
|
||||
|
||||
# multi-gen LRU {
|
||||
config LRU_GEN
|
||||
|
||||
Reference in New Issue
Block a user