summaryrefslogtreecommitdiff
path: root/sys/compat/linux
diff options
context:
space:
mode:
authornjoly <njoly@NetBSD.org>2008-10-21 21:52:29 +0000
committernjoly <njoly@NetBSD.org>2008-10-21 21:52:29 +0000
commitd05df800a85db7d662bccd75d0e43c8f8f00d1c3 (patch)
tree46126f0b60561278c3cee73a6cafeced3097bda4 /sys/compat/linux
parent7395238cc53d28557c0f68b730fce81e3992e7ea (diff)
Do not use native_to_linux_si_code() outside LINUX_NPTL; until i
figure a better way to handle it.
Diffstat (limited to 'sys/compat/linux')
-rw-r--r--sys/compat/linux/arch/i386/linux_machdep.c6
-rw-r--r--sys/compat/linux/common/linux_signal.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/compat/linux/arch/i386/linux_machdep.c b/sys/compat/linux/arch/i386/linux_machdep.c
index 0b876d24c8b..af32b7dcbd4 100644
--- a/sys/compat/linux/arch/i386/linux_machdep.c
+++ b/sys/compat/linux/arch/i386/linux_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_machdep.c,v 1.139 2008/10/19 09:44:31 njoly Exp $ */
+/* $NetBSD: linux_machdep.c,v 1.140 2008/10/21 21:52:29 njoly Exp $ */
/*-
* Copyright (c) 1995, 2000, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.139 2008/10/19 09:44:31 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.140 2008/10/21 21:52:29 njoly Exp $");
#if defined(_KERNEL_OPT)
#include "opt_vm86.h"
@@ -283,7 +283,7 @@ linux_rt_sendsig(const ksiginfo_t *ksi, const sigset_t *mask)
*/
(void)memset(lsi = &frame.sf_si, 0, sizeof(frame.sf_si));
lsi->lsi_errno = native_to_linux_errno[ksi->ksi_errno];
- lsi->lsi_code = native_to_linux_si_code(ksi->ksi_code);
+ lsi->lsi_code = ksi->ksi_code;
switch (lsi->lsi_signo = frame.sf_sig) {
case LINUX_SIGILL:
case LINUX_SIGFPE:
diff --git a/sys/compat/linux/common/linux_signal.c b/sys/compat/linux/common/linux_signal.c
index 73411f780c8..950fdc7f86d 100644
--- a/sys/compat/linux/common/linux_signal.c
+++ b/sys/compat/linux/common/linux_signal.c
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_signal.c,v 1.65 2008/10/21 13:36:28 njoly Exp $ */
+/* $NetBSD: linux_signal.c,v 1.66 2008/10/21 21:52:29 njoly 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.65 2008/10/21 13:36:28 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_signal.c,v 1.66 2008/10/21 21:52:29 njoly Exp $");
#define COMPAT_LINUX 1
@@ -671,7 +671,6 @@ linux_sys_tgkill(struct lwp *l, const struct linux_sys_tgkill_args *uap, registe
return linux_do_tkill(l, SCARG(uap, tgid), SCARG(uap, tid), SCARG(uap, sig));
}
-#endif /* LINUX_NPTL */
int
native_to_linux_si_code(int code)
@@ -686,3 +685,4 @@ native_to_linux_si_code(int code)
return code;
}
+#endif /* LINUX_NPTL */