From 45e39acbe78714e37c2c4085977a446b2251a8fc Mon Sep 17 00:00:00 2001 From: yueyuankun Date: Mon, 3 Jun 2024 15:03:54 +0800 Subject: [PATCH] support loongarch, fix compilation errors (cherry picked from commit 49807afff5c874fb83f08665917883eb3d081a1e) --- sysmonitor-kmod.spec | 9 ++++++- ...ort-loongarch-fix-compilation-errors.patch | 25 +++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 update-support-loongarch-fix-compilation-errors.patch diff --git a/sysmonitor-kmod.spec b/sysmonitor-kmod.spec index 67d01ba..b157b64 100644 --- a/sysmonitor-kmod.spec +++ b/sysmonitor-kmod.spec @@ -7,7 +7,7 @@ %define kmod_name sysmonitor %define version 1.3.2 -%define releaseversion 1.4 +%define releaseversion 1.5 Summary: System Monitor Daemon Name: %{kmod_name}-kmod Version: %{version} @@ -37,6 +37,7 @@ Provides: sysmonitor Patch1: bugfix-fix-signal-monitor-err.patch Patch2: bugfix-fix-fd-path-failed-to-open.patch +Patch3: update-support-loongarch-fix-compilation-errors.patch %description System Monitor Daemon @@ -171,6 +172,12 @@ systemctl daemon-reload 2>/dev/null 1>/dev/null /usr/lib/systemd/system/multi-user.target.wants/sysmonitor.service %changelog +* Mon Jun 03 2024 yueyuankun - 1.3.2-1.5 +- Type:update +- CVE:NA +- SUG:NA +- DESC: support loongarch, fix compilation errors + * Thu Apr 11 2024 tenglei - 1.3.2-1.4 - Type:bugfix - CVE:NA diff --git a/update-support-loongarch-fix-compilation-errors.patch b/update-support-loongarch-fix-compilation-errors.patch new file mode 100644 index 0000000..2958fae --- /dev/null +++ b/update-support-loongarch-fix-compilation-errors.patch @@ -0,0 +1,25 @@ +From fb19b25f3723c6274bf0225c0cbd33180e726707 Mon Sep 17 00:00:00 2001 +From: yueyuankun +Date: Mon, 3 Jun 2024 14:54:20 +0800 +Subject: [PATCH] support loongarch, fix compilation errors + +--- + module/signo_catch.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/module/signo_catch.c b/module/signo_catch.c +index c038e16..a9270e0 100644 +--- a/module/signo_catch.c ++++ b/module/signo_catch.c +@@ -257,7 +257,7 @@ out: + + static int pre_handler(struct kprobe *p, struct pt_regs *regs) + { +-#ifdef CONFIG_ARM64 ++#if (defined(CONFIG_ARM64) || defined(CONFIG_LOONGARCH)) + send_sig_info_data_t data; + data.sig = regs->regs[0]; + data.info = (struct kernel_siginfo *)((unsigned long *)regs->regs[1]); +-- +2.43.0 + -- Gitee