packages/kpatch
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!64 livepatch-patch-hook: fix HAVE_SIMPLE_ENABLE

Browse Source 
From: @hubin95 
Reviewed-by: @xiezhipeng1 
Signed-off-by: @xiezhipeng1
This commit is contained in:
openeuler-ci-bot 2022-05-12 06:06:14 +00:00 committed by Gitee
commit 348a51fb1d
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
0029-livepatch-patch-hook-disable-HAVE_SIMPLE_ENABLE-to-k.patch
View File

@ -1,7 +1,7 @@
From e8a1f76c0409720106df90e6358d2b00c496b74d Mon Sep 17 00:00:00 2001 From 5b34dae2eaf57c33beb5cd4e3972a4580259a5fc Mon Sep 17 00:00:00 2001
From: hubin <hubin73@huawei.com> From: hubin <hubin73@huawei.com>
Date: Tue, 10 May 2022 15:26:25 +0800 Date: Tue, 10 May 2022 15:26:25 +0800
Subject: [PATCH 1/9] livepatch-patch-hook: disable HAVE_SIMPLE_ENABLE to keep Subject: [PATCH] livepatch-patch-hook: disable HAVE_SIMPLE_ENABLE to keep
register and unregister step of hotpatch register and unregister step of hotpatch
Signed-off-by: Bin Hu <hubin73@huawei.com> Signed-off-by: Bin Hu <hubin73@huawei.com>
@ -10,18 +10,18 @@ Signed-off-by: Bin Hu <hubin73@huawei.com>
1 file changed, 2 deletions(-) 1 file changed, 2 deletions(-)
diff --git a/kmod/patch/livepatch-patch-hook.c b/kmod/patch/livepatch-patch-hook.c diff --git a/kmod/patch/livepatch-patch-hook.c b/kmod/patch/livepatch-patch-hook.c
index 9e56fe3..339b00f 100644 index 9e56fe3..b565a6a 100644
--- a/kmod/patch/livepatch-patch-hook.c --- a/kmod/patch/livepatch-patch-hook.c
+++ b/kmod/patch/livepatch-patch-hook.c +++ b/kmod/patch/livepatch-patch-hook.c
@@ -78,8 +78,6 @@ @@ -70,8 +70,6 @@
# if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(8, 2) RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(8, 2)
# define HAVE_KLP_REPLACE # define HAVE_SIMPLE_ENABLE
# endif # endif
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0) -#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
-# define HAVE_KLP_REPLACE -# define HAVE_SIMPLE_ENABLE
#endif #endif
#ifndef KLP_REPLACE_ENABLE #ifdef RHEL_RELEASE_CODE
-- --
2.31.0.windows.1 2.31.0.windows.1

8
kpatch.spec
View File

@ -1,7 +1,7 @@
Name: kpatch Name: kpatch
Epoch: 1 Epoch: 1
Version: 0.9.5 Version: 0.9.5
Release: 7 Release: 8
Summary: A Linux dynamic kernel patching infrastructure Summary: A Linux dynamic kernel patching infrastructure
License: GPLv2 License: GPLv2
@ -111,6 +111,12 @@ popd
%{_mandir}/man1/*.1.gz %{_mandir}/man1/*.1.gz
%changelog %changelog
* Thu May 12 2022 Bin Hu <hubin73@huawei.com> -1:0.9.5-8
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:livepatch-patch-hook: fix HAVE_SIMPLE_ENABLE
* Tue May 10 2022 Bin Hu <hubin73@huawei.com> -1:0.9.5-7 * Tue May 10 2022 Bin Hu <hubin73@huawei.com> -1:0.9.5-7
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA