diff options
| author | njoly <njoly@NetBSD.org> | 2009-05-29 14:19:12 +0000 |
|---|---|---|
| committer | njoly <njoly@NetBSD.org> | 2009-05-29 14:19:12 +0000 |
| commit | d22e6f64ab506ef4ba2c366aca4e71ba2f666207 (patch) | |
| tree | 001b92ea46346e2f01801daa015b32e38001d563 /sys/compat/linux/arch | |
| parent | 4c494f7678a94d301a0b4643623bcfe63b8f2cbb (diff) | |
Add native to linux siginfo si_status translation, used on i386 and
amd64.
Diffstat (limited to 'sys/compat/linux/arch')
| -rw-r--r-- | sys/compat/linux/arch/amd64/linux_machdep.c | 21 | ||||
| -rw-r--r-- | sys/compat/linux/arch/i386/linux_machdep.c | 8 |
2 files changed, 8 insertions, 21 deletions
diff --git a/sys/compat/linux/arch/amd64/linux_machdep.c b/sys/compat/linux/arch/amd64/linux_machdep.c index 218d4f93217..5313e94cc67 100644 --- a/sys/compat/linux/arch/amd64/linux_machdep.c +++ b/sys/compat/linux/arch/amd64/linux_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_machdep.c,v 1.35 2009/03/18 16:00:16 cegger Exp $ */ +/* $NetBSD: linux_machdep.c,v 1.36 2009/05/29 14:19:12 njoly 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.35 2009/03/18 16:00:16 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.36 2009/05/29 14:19:12 njoly Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -43,7 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.35 2009/03/18 16:00:16 cegger Ex #include <sys/proc.h> #include <sys/ptrace.h> /* for process_read_fpregs() */ #include <sys/user.h> -#include <sys/wait.h> #include <sys/ucontext.h> #include <sys/conf.h> @@ -246,20 +245,8 @@ linux_sendsig(const ksiginfo_t *ksi, const sigset_t *mask) sigframe.info._sifields._sigchld._uid = ksi->ksi_uid; sigframe.info._sifields._sigchld._utime = ksi->ksi_utime; sigframe.info._sifields._sigchld._stime = ksi->ksi_stime; - - if (WCOREDUMP(ksi->ksi_status)) { - sigframe.info.lsi_code = LINUX_CLD_DUMPED; - sigframe.info._sifields._sigchld._status = - _WSTATUS(ksi->ksi_status); - } else if (_WSTATUS(ksi->ksi_status)) { - sigframe.info.lsi_code = LINUX_CLD_KILLED; - sigframe.info._sifields._sigchld._status = - _WSTATUS(ksi->ksi_status); - } else { - sigframe.info.lsi_code = LINUX_CLD_EXITED; - sigframe.info._sifields._sigchld._status = - ((ksi->ksi_status & 0xff00U) >> 8); - } + sigframe.info._sifields._sigchld._status = + native_to_linux_si_status(ksi->ksi_code, ksi->ksi_status); break; case LINUX_SIGIO: sigframe.info._sifields._sigpoll._band = ksi->ksi_band; diff --git a/sys/compat/linux/arch/i386/linux_machdep.c b/sys/compat/linux/arch/i386/linux_machdep.c index 08f127fb236..b63e73f6e00 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.144 2009/04/23 17:37:51 njoly Exp $ */ +/* $NetBSD: linux_machdep.c,v 1.145 2009/05/29 14:19:13 njoly Exp $ */ /*- * Copyright (c) 1995, 2000, 2008, 2009 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.144 2009/04/23 17:37:51 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.145 2009/05/29 14:19:13 njoly Exp $"); #if defined(_KERNEL_OPT) #include "opt_vm86.h" @@ -298,8 +298,8 @@ linux_rt_sendsig(const ksiginfo_t *ksi, const sigset_t *mask) lsi->lsi_pid = ksi->ksi_pid; lsi->lsi_utime = ksi->ksi_utime; lsi->lsi_stime = ksi->ksi_stime; - /* XXX is that right? */ - lsi->lsi_status = WEXITSTATUS(ksi->ksi_status); + lsi->lsi_status = + native_to_linux_si_status(ksi->ksi_code, ksi->ksi_status); break; case LINUX_SIGIO: lsi->lsi_band = ksi->ksi_band; |
