From 7e085ad49d8d410c63c38b698fcce76f4ba52733 Mon Sep 17 00:00:00 2001 From: Cheng Jian Date: Tue, 12 Feb 2019 21:26:14 +0800 Subject: [PATCH] livepatch/config: depends on DEBUG_INFO MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit euler inclusion category: bugfix Bugzilla: 9285/5507 CVE: N/A ---------------------------------------- livepatch depends on CONFIG_DEBUG_INFO=y, which isn't selected by `make allmodconfig` on arm64, that will cause the next build errors. In function ‘klp_disable_patch’: kernel/livepatch/core.c:497:8: error: implicit declaration of function ‘__klp_disable_patch’; did you mean ‘klp_disable_patch’? [-Werror=implicit-function-declaration] In function ‘klp_enable_patch’: kernel/livepatch/core.c:706:8: error: implicit declaration of function ‘__klp_enable_patch’; did you mean ‘klp_enable_patch’? [-Werror=implicit-function-declaration] In function ‘klp_check_calltrace’: arch/arm64/kernel/livepatch.c:126:4: error: implicit declaration of function ‘show_stack’; did you mean ‘dump_stack’? [-Werror=implicit-function-declaration] fix commit 842d0fd7ce9e ("livepatch/core: allow implementation without ftrace") Signed-off-by: Cheng Jian Reviewed-by: Zhen Lei Signed-off-by: Yang Yingliang --- kernel/livepatch/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/livepatch/Kconfig b/kernel/livepatch/Kconfig index 02bf7e84b845..897749ce4396 100644 --- a/kernel/livepatch/Kconfig +++ b/kernel/livepatch/Kconfig @@ -19,6 +19,7 @@ config LIVEPATCH depends on KALLSYMS_ALL depends on HAVE_LIVEPATCH_FTRACE || HAVE_LIVEPATCH_WO_FTRACE depends on !TRIM_UNUSED_KSYMS + depends on DEBUG_INFO default n help Say Y here if you want to support kernel live patching. @@ -44,7 +45,6 @@ config LIVEPATCH_FTRACE config LIVEPATCH_WO_FTRACE bool "without ftrace" depends on HAVE_LIVEPATCH_WO_FTRACE - depends on DEBUG_INFO select LIVEPATCH_STOP_MACHINE_CONSISTENCY help Supports kernel live patching without ftrace -- GitLab