diff options
| author | Mark Brown <broonie@kernel.org> | 2022-08-04 17:57:10 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-08-04 17:57:10 +0100 |
| commit | 36fbc25b4ef8c4833242060ad90be77ced9d59f2 (patch) | |
| tree | 1a1a4c75de9b214e04aa3b2d1ed3fc656570db36 /arch/x86/Kconfig | |
| parent | 465d4efa41826f7bdb7516438e54048bb670daeb (diff) | |
| parent | 360614c01f81f48a89d8b13f8fa69c3ae0a1f5c7 (diff) | |
Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
# Conflicts:
# Documentation/translations/zh_CN/mm/free_page_reporting.rst
# Documentation/translations/zh_CN/mm/frontswap.rst
# Documentation/translations/zh_CN/mm/page_frags.rst
# Documentation/translations/zh_CN/mm/page_migration.rst
# Documentation/translations/zh_CN/mm/vmalloced-kernel-stacks.rst
# Documentation/translations/zh_CN/mm/zsmalloc.rst
# include/linux/pagevec.h
# mm/internal.h
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 74572c65d97f..3ca198742b10 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -94,7 +94,6 @@ config X86 select ARCH_HAS_SYNC_CORE_BEFORE_USERMODE select ARCH_HAS_SYSCALL_WRAPPER select ARCH_HAS_UBSAN_SANITIZE_ALL - select ARCH_HAS_VM_GET_PAGE_PROT select ARCH_HAS_DEBUG_WX select ARCH_HAS_ZONE_DMA_SET if EXPERT select ARCH_HAVE_NMI_SAFE_CMPXCHG |