diff --git a/0041-livepatch-patch-hook-fix-kpatch-build-error-which-do.patch b/0041-livepatch-patch-hook-fix-kpatch-build-error-which-do.patch new file mode 100644 index 0000000..5892dfa --- /dev/null +++ b/0041-livepatch-patch-hook-fix-kpatch-build-error-which-do.patch @@ -0,0 +1,43 @@ +From ec538d436364293b15e41f3c2c2a8ab389c7b043 Mon Sep 17 00:00:00 2001 +From: tangbin +Date: Mon, 5 Sep 2022 12:09:06 -0400 +Subject: [PATCH] livepatch-patch-hook: fix kpatch-build error which do not + support ftrace +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When using the kernel 5.10.0-60.18.0.50.oe2203 in x86_64, and chose the +livepatch with ftrace, it will show not support for this feature, which +is not allowed, the error displays as follows: + +In file included from /root/.kpatch/tmp/patch/patch-hook.c:21: +/root/.kpatch/tmp/patch/livepatch-patch-hook.c: In function ‘patch_init’: +/root/.kpatch/tmp/patch/livepatch-patch-hook.c:606:8: error: implicit declaration of function ‘klp_register_patch’; did you mean ‘klp_enable_patch’? [-Werror=implicit-function-declaration] + 606 | ret = klp_register_patch(lpatch); + | ^~~~~~~~~~~~~~~~~~ + | klp_enable_patch + +So fix this problem. + +Signed-off-by: tangbin +--- + kmod/patch/livepatch-patch-hook.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/kmod/patch/livepatch-patch-hook.c b/kmod/patch/livepatch-patch-hook.c +index b565a6a..5d8780c 100644 +--- a/kmod/patch/livepatch-patch-hook.c ++++ b/kmod/patch/livepatch-patch-hook.c +@@ -70,6 +70,8 @@ + RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(8, 2) + # define HAVE_SIMPLE_ENABLE + # endif ++# elif (defined(CONFIG_LIVEPATCH_FTRACE)) ++# define HAVE_SIMPLE_ENABLE + #endif + + #ifdef RHEL_RELEASE_CODE +-- +2.18.4 + diff --git a/kpatch.spec b/kpatch.spec index 083350a..bd6a5bb 100644 --- a/kpatch.spec +++ b/kpatch.spec @@ -1,7 +1,7 @@ Name: kpatch Epoch: 1 Version: 0.9.5 -Release: 10 +Release: 11 Summary: A Linux dynamic kernel patching infrastructure License: GPLv2 @@ -53,6 +53,7 @@ Patch0037:0037-create-diff-object-skip-creating-.kpatch.arch-sectio.patch Patch0038:0038-kpatch-build-do-not-copy-linux-scripts-when.patch Patch0039:0039-create-diff-object-ignore-change-of-certain.patch Patch0040:0040-create-diff-object-allow-__jump_table-section.patch +Patch0041:0041-livepatch-patch-hook-fix-kpatch-build-error-which-do.patch BuildRequires: gcc elfutils-libelf-devel kernel-devel git Requires: bc make gcc patch bison flex openssl-devel @@ -113,6 +114,12 @@ popd %{_mandir}/man1/*.1.gz %changelog +* Mon Sep 5 2022 Tang Bin -1:0.9.5-11 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:livepatch-patch-hook: fix kpatch-build error which do not support ftrace + * Mon May 30 2022 Bin Hu -1:0.9.5-10 - Type:bugfix - ID:NA