From: Cheng Jian <cj.chengjian@huawei.com> hulk inclusion category: feature bugzilla: 5507 CVE: NA --------------------------- We have completed the livepatch without ftrace for x86_64, we can now enable it. Signed-off-by: Cheng Jian <cj.chengjian@huawei.com> Reviewed-By: Xie XiuQi <xiexiuqi@huawei.com> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- arch/x86/configs/openeuler_defconfig | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig index 1cf7b97..f76c144 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig @@ -1,5 +1,13 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/x86_64 4.19.106 Kernel Configuration +# + +# +# Compiler: gcc (Ubuntu 5.5.0-12ubuntu5~16.04) 5.5.0 20171010 +# CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=50400 +CONFIG_GCC_VERSION=50500 CONFIG_CLANG_VERSION=0 CONFIG_CC_HAS_ASM_GOTO=y CONFIG_IRQ_WORK=y @@ -433,11 +441,17 @@ CONFIG_LEGACY_VSYSCALL_EMULATE=y # CONFIG_CMDLINE_BOOL is not set CONFIG_MODIFY_LDT_SYSCALL=y CONFIG_HAVE_LIVEPATCH_FTRACE=y +CONFIG_HAVE_LIVEPATCH_WO_FTRACE=y # # Enable Livepatch # -# CONFIG_LIVEPATCH is not set +CONFIG_LIVEPATCH=y +# CONFIG_LIVEPATCH_FTRACE is not set +CONFIG_LIVEPATCH_WO_FTRACE=y +CONFIG_LIVEPATCH_STOP_MACHINE_CONSISTENCY=y +# CONFIG_LIVEPATCH_STACK is not set +CONFIG_LIVEPATCH_RESTRICT_KPROBE=y CONFIG_ARCH_HAS_ADD_PAGES=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y -- 1.8.3