[PATCH OLK-6.6 0/2] Disable userswap by default
Disable userswap by default. Wupeng Ma (2): mm/userswap: remove boot param openeuler_defconfig: disable CONFIG_USERSWAP by default arch/arm64/configs/openeuler_defconfig | 2 +- arch/x86/configs/openeuler_defconfig | 2 +- mm/userswap.c | 7 ------- 3 files changed, 2 insertions(+), 9 deletions(-) -- 2.43.0
hulk inclusion category: bugfix bugzilla: https://atomgit.com/openeuler/kernel/issues/9186 ------------------------------------------ There is no need to enable userswap. Remote the boot param to make sure it can not be enable. Fixes: af2100e24d47 ("mm/userswap: add enable_userswap boot option") Signed-off-by: Wupeng Ma <mawupeng1@huawei.com> --- mm/userswap.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/mm/userswap.c b/mm/userswap.c index 22e3f147ce5f9..3f5b93c5b8d63 100644 --- a/mm/userswap.c +++ b/mm/userswap.c @@ -547,10 +547,3 @@ int mfill_atomic_pte_nocopy(struct mm_struct *mm, pmd_t *dst_pmd, put_page(page); return ret; } - -static int __init enable_userswap_setup(char *str) -{ - static_branch_enable(&userswap_enabled); - return 1; -} -__setup("enable_userswap", enable_userswap_setup); -- 2.43.0
hulk inclusion category: bugfix bugzilla: https://atomgit.com/openeuler/kernel/issues/9186 ------------------------------------------ Disable userswap by default. Fixes: 945d1ffac2b5 ("mm/userswap: openeuler_defconfig: enable userswap") Signed-off-by: Wupeng Ma <mawupeng1@huawei.com> --- arch/arm64/configs/openeuler_defconfig | 2 +- arch/x86/configs/openeuler_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index 8a08c6445e18c..470a2215ff894 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -1255,7 +1255,7 @@ CONFIG_SECRETMEM=y # CONFIG_ANON_VMA_NAME is not set CONFIG_USERFAULTFD=y CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y -CONFIG_USERSWAP=y +# CONFIG_USERSWAP is not set CONFIG_LRU_GEN=y # CONFIG_LRU_GEN_ENABLED is not set # CONFIG_LRU_GEN_STATS is not set diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig index 93b5c5c2589c2..b9fdab34c99ff 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig @@ -1217,7 +1217,7 @@ CONFIG_USERFAULTFD=y CONFIG_HAVE_ARCH_USERFAULTFD_WP=y CONFIG_HAVE_ARCH_USERFAULTFD_MINOR=y CONFIG_PTE_MARKER_UFFD_WP=y -CONFIG_USERSWAP=y +# CONFIG_USERSWAP is not set CONFIG_LRU_GEN=y # CONFIG_LRU_GEN_ENABLED is not set # CONFIG_LRU_GEN_STATS is not set -- 2.43.0
反馈： 您发送到kernel@openeuler.org的补丁/补丁集，已成功转换为PR！ PR链接地址： https://atomgit.com/openeuler/kernel/merge_requests/23276 邮件列表地址：https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/BYG... FeedBack: The patch(es) which you have sent to kernel@openeuler.org mailing list has been converted to a pull request successfully! Pull request link: https://atomgit.com/openeuler/kernel/merge_requests/23276 Mailing list address: https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/BYG...
participants (2)
-
patchwork bot -
Wupeng Ma