Open
add sw_64 support #33
maqi77Add on Mar 3, 2025
add sw_64 support #33
Open
Merged fromrefs/pull/33/headintoopenEuler-24.03-LTS-SP1
Total: 2 files changed+20-1
| @@ -0,0 +1,12 @@ | |||
| 1 | +diff -Naur a/module/signo_catch.c b/module/signo_catch.c | ||
| 2 | +--- a/module/signo_catch.c 2024-12-12 11:32:37.111079569 +0800 | ||
| 3 | ++++ b/module/signo_catch.c 2024-12-12 14:25:26.613605966 +0800 | ||
| 4 | +@@ -257,7 +257,7 @@ | ||
| 5 | + | ||
| 6 | + static int pre_handler(struct kprobe *p, struct pt_regs *regs) | ||
| 7 | + { | ||
| 8 | +-#if (defined(CONFIG_ARM64) || defined(CONFIG_LOONGARCH)) | ||
| 9 | ++#if (defined(CONFIG_ARM64) || defined(CONFIG_LOONGARCH) || defined(CONFIG_SW64)) | ||
| 10 | + send_sig_info_data_t data; | ||
| 11 | + data.sig = regs->regs[0]; | ||
| 12 | + data.info = (struct kernel_siginfo *)((unsigned long *)regs->regs[1]); | ||
| @@ -7,7 +7,7 @@ | |||
| 7 | 7 | ||
| 8 | %define kmod_name sysmonitor | 8 | %define kmod_name sysmonitor |
| 9 | %define version 1.3.2 | 9 | %define version 1.3.2 |
| 10 | -%define releaseversion 1.6 | 10 | +%define releaseversion 1.7 |
| 11 | Summary: System Monitor Daemon | 11 | Summary: System Monitor Daemon |
| 12 | Name: %{kmod_name}-kmod | 12 | Name: %{kmod_name}-kmod |
| 13 | Version: %{version} | 13 | Version: %{version} |
| @@ -39,6 +39,7 @@ Patch1: bugfix-fix-signal-monitor-err.patch | |||
| 39 | Patch2: bugfix-fix-fd-path-failed-to-open.patch | 39 | Patch2: bugfix-fix-fd-path-failed-to-open.patch |
| 40 | Patch3: update-support-loongarch-fix-compilation-errors.patch | 40 | Patch3: update-support-loongarch-fix-compilation-errors.patch |
| 41 | Patch4: add-riscv64-support.patch | 41 | Patch4: add-riscv64-support.patch |
| 42 | +Patch5: add-sw64-support.patch | ||
| 42 | 43 | ||
| 43 | %description | 44 | %description |
| 44 | System Monitor Daemon | 45 | System Monitor Daemon |
| @@ -173,6 +174,12 @@ systemctl daemon-reload 2>/dev/null 1>/dev/null | |||
| 173 | /usr/lib/systemd/system/multi-user.target.wants/sysmonitor.service | 174 | /usr/lib/systemd/system/multi-user.target.wants/sysmonitor.service |
| 174 | 175 | ||
| 175 | %changelog | 176 | %changelog |
| 177 | +* Mon Mar 03 2025 maqi <maqi@uniontech.com> - 1.3.2-1.7 | ||
| 178 | +- Type:update | ||
| 179 | +- CVE:NA | ||
| 180 | +- SUG:NA | ||
| 181 | +- DESC: support sw_64 | ||
| 182 | + | ||
| 176 | * Mon Jun 03 2024 laokz <zhangkai@iscas.ac.cn> - 1.3.2-1.6 | 183 | * Mon Jun 03 2024 laokz <zhangkai@iscas.ac.cn> - 1.3.2-1.6 |
| 177 | - Type:update | 184 | - Type:update |
| 178 | - CVE:NA | 185 | - CVE:NA |