Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not use native_to_linux_si_code() outside LINUX_NPTL; until i 

figure a better way to handle it.
This commit is contained in:
njoly 2008-10-21 21:52:29 +00:00
parent 7395238cc5
commit d05df800a8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/compat/linux/arch/i386/linux_machdep.c
View File

@ -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. * Copyright (c) 1995, 2000, 2008 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/ */
#include <sys/cdefs.h> #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) #if defined(_KERNEL_OPT)
#include "opt_vm86.h" #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)); (void)memset(lsi = &frame.sf_si, 0, sizeof(frame.sf_si));
lsi->lsi_errno = native_to_linux_errno[ksi->ksi_errno]; 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) { switch (lsi->lsi_signo = frame.sf_sig) {
case LINUX_SIGILL: case LINUX_SIGILL:
case LINUX_SIGFPE: case LINUX_SIGFPE:

6
sys/compat/linux/common/linux_signal.c
View File

@ -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. * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@ -48,7 +48,7 @@
*/ */
#include <sys/cdefs.h> #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 #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)); return linux_do_tkill(l, SCARG(uap, tgid), SCARG(uap, tid), SCARG(uap, sig));
} }
#endif /* LINUX_NPTL */
int int
native_to_linux_si_code(int code) native_to_linux_si_code(int code)
@ -686,3 +685,4 @@ native_to_linux_si_code(int code)
return code; return code;
} }
#endif /* LINUX_NPTL */