Module Name: src
Committed By: thorpej
Date: Wed Oct 27 16:40:05 UTC 2021
Modified Files:
src/sys/compat/linux/arch/amd64: linux_machdep.c
src/sys/compat/linux/common: linux_signal.c
Log Message:
Use __SIGTRAMP_SIGCODE_VERSION rather than hard-coding 0.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/compat/linux/arch/amd64/linux_machdep.c
cvs rdiff -u -r1.86 -r1.87 src/sys/compat/linux/common/linux_signal.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/arch/amd64/linux_machdep.c
diff -u src/sys/compat/linux/arch/amd64/linux_machdep.c:1.60 src/sys/compat/linux/arch/amd64/linux_machdep.c:1.61
--- src/sys/compat/linux/arch/amd64/linux_machdep.c:1.60 Tue Sep 7 11:43:03 2021
+++ src/sys/compat/linux/arch/amd64/linux_machdep.c Wed Oct 27 16:40:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_machdep.c,v 1.60 2021/09/07 11:43:03 riastradh Exp $ */
+/* $NetBSD: linux_machdep.c,v 1.61 2021/10/27 16:40:04 thorpej Exp $ */
/*-
* Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.60 2021/09/07 11:43:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.61 2021/10/27 16:40:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -167,7 +167,7 @@ linux_sendsig(const ksiginfo_t *ksi, con
sfp = (struct linux_rt_sigframe *)sp;
memset(&sigframe, 0, sizeof(sigframe));
- if (ps->sa_sigdesc[sig].sd_vers != 0)
+ if (ps->sa_sigdesc[sig].sd_vers != __SIGTRAMP_SIGCODE_VERSION)
sigframe.pretcode =
(char *)(u_long)ps->sa_sigdesc[sig].sd_tramp;
else
Index: src/sys/compat/linux/common/linux_signal.c
diff -u src/sys/compat/linux/common/linux_signal.c:1.86 src/sys/compat/linux/common/linux_signal.c:1.87
--- src/sys/compat/linux/common/linux_signal.c:1.86 Thu Sep 23 06:56:27 2021
+++ src/sys/compat/linux/common/linux_signal.c Wed Oct 27 16:40:05 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_signal.c,v 1.86 2021/09/23 06:56:27 ryo Exp $ */
+/* $NetBSD: linux_signal.c,v 1.87 2021/10/27 16:40:05 thorpej Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_signal.c,v 1.86 2021/09/23 06:56:27 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_signal.c,v 1.87 2021/10/27 16:40:05 thorpej Exp $");
#define COMPAT_LINUX 1
@@ -391,7 +391,7 @@ linux_sys_rt_sigaction(struct lwp *l, co
native_to_linux_sigaction(&olsa, &obsa);
#ifdef LINUX_SA_RESTORER
- if (ps->sa_sigdesc[sig].sd_vers != 0) {
+ if (ps->sa_sigdesc[sig].sd_vers != __SIGTRAMP_SIGCODE_VERSION) {
olsa.linux_sa_restorer = ps->sa_sigdesc[sig].sd_tramp;
olsa.linux_sa_flags |= LINUX_SA_RESTORER;
}
