 @@ -1,14 +1,14 @@
-/*	$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.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -23,37 +23,36 @@
  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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>
 #include <sys/systm.h>
 #include <sys/signal.h>
 #include <sys/exec.h>
 #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>
 #include <machine/reg.h>
 #include <machine/pcb.h>
 #include <machine/fpu.h>
 #include <machine/mcontext.h>
 #include <machine/specialreg.h>
 #include <machine/vmparam.h>
 #include <machine/cpufunc.h>
 /*
  * To see whether wscons is configured (for virtual console ioctl calls).
 @@ -236,40 +235,28 @@ linux_sendsig(const ksiginfo_t *ksi, con
 	switch (sigframe.info.lsi_signo) {
 	case LINUX_SIGILL:
 	case LINUX_SIGFPE:
 	case LINUX_SIGSEGV:
 	case LINUX_SIGBUS:
 	case LINUX_SIGTRAP:
 		sigframe.info._sifields._sigfault._addr = ksi->ksi_addr;
 		break;
 	case LINUX_SIGCHLD:
 		sigframe.info._sifields._sigchld._pid = ksi->ksi_pid;
 		sigframe.info._sifields._sigchld._uid = ksi->ksi_uid;
 		sigframe.info._sifields._sigchld._utime = ksi->ksi_utime;
 		sigframe.info._sifields._sigchld._stime = ksi->ksi_stime;
 		sigframe.info._sifields._sigchld._status =
-		if (WCOREDUMP(ksi->ksi_status)) {
+		    native_to_linux_si_status(ksi->ksi_code, 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);
 		break;
 	case LINUX_SIGIO:
 		sigframe.info._sifields._sigpoll._band = ksi->ksi_band;
 		sigframe.info._sifields._sigpoll._fd = ksi->ksi_fd;
 		break;
 	default:
 		sigframe.info._sifields._sigchld._pid = ksi->ksi_pid;
 		sigframe.info._sifields._sigchld._uid = ksi->ksi_uid;
 		if ((sigframe.info.lsi_signo == LINUX_SIGALRM) ||
 		    (sigframe.info.lsi_signo >= LINUX_SIGRTMIN))
 			sigframe.info._sifields._timer._sigval.sival_ptr =
 			     ksi->ksi_value.sival_ptr;
 		break;

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Frank van der Linden, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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"
 #include "opt_user_ldt.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signalvar.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/user.h>
 #include <sys/buf.h>
 @@ -288,28 +288,28 @@ linux_rt_sendsig(const ksiginfo_t *ksi,
 	switch (lsi->lsi_signo = frame.sf_sig) {
 	case LINUX_SIGILL:
 	case LINUX_SIGFPE:
 	case LINUX_SIGSEGV:
 	case LINUX_SIGBUS:
 	case LINUX_SIGTRAP:
 		lsi->lsi_addr = ksi->ksi_addr;
 		break;
 	case LINUX_SIGCHLD:
 		lsi->lsi_uid = ksi->ksi_uid;
 		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 =
-		lsi->lsi_status = WEXITSTATUS(ksi->ksi_status);
+		    native_to_linux_si_status(ksi->ksi_code, ksi->ksi_status);
 		break;
 	case LINUX_SIGIO:
 		lsi->lsi_band = ksi->ksi_band;
 		lsi->lsi_fd = ksi->ksi_fd;
 		break;
 	default:
 		lsi->lsi_uid = ksi->ksi_uid;
 		lsi->lsi_pid = ksi->ksi_pid;
 		if (lsi->lsi_signo == LINUX_SIGALRM ||
 		    lsi->lsi_signo >= LINUX_SIGRTMIN)
 			lsi->lsi_value.sival_ptr = ksi->ksi_value.sival_ptr;
 		break;
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_signal.c,v 1.67 2009/02/18 14:43:22 njoly Exp $	*/
+/*	$NetBSD: linux_signal.c,v 1.68 2009/05/29 14:19:13 njoly Exp $	*/
 /*-
  * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Frank van der Linden and Eric Haszlakiewicz.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -38,41 +38,42 @@
  *	linux_sys_siggetmask	: linux_sig_notalpha.c
  *	linux_sys_sigsetmask	: linux_sig_notalpha.c
  *	linux_sys_pause		: linux_sig_notalpha.c
  *	linux_sys_sigaction	: linux_sigaction.c
+ *
  */
 /*
  *   Unimplemented:
  *	linux_sys_rt_sigtimedwait	: sigsuspend w/timeout.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_signal.c,v 1.67 2009/02/18 14:43:22 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_signal.c,v 1.68 2009/05/29 14:19:13 njoly Exp $");
 #define COMPAT_LINUX 1
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/filedesc.h>
 #include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <sys/kernel.h>
 #include <sys/signal.h>
 #include <sys/signalvar.h>
 #include <sys/malloc.h>
 #include <sys/wait.h>
 #include <sys/syscallargs.h>
 #include <compat/linux/common/linux_types.h>
 #include <compat/linux/common/linux_signal.h>
 #include <compat/linux/common/linux_exec.h> /* For emul_linux */
 #include <compat/linux/common/linux_machdep.h> /* For LINUX_NPTL */
 #include <compat/linux/common/linux_emuldata.h> /* for linux_emuldata */
 #include <compat/linux/common/linux_siginfo.h>
 #include <compat/linux/common/linux_sigevent.h>
 #include <compat/linux/common/linux_util.h>
 #include <compat/linux/common/linux_ipc.h>
 #include <compat/linux/common/linux_sem.h>
 @@ -676,13 +677,37 @@ linux_sys_tgkill(struct lwp *l, const st
 int
 native_to_linux_si_code(int code)
+{
 	int si_codes[] = {
 	    LINUX_SI_USER, LINUX_SI_QUEUE, LINUX_SI_TIMER, LINUX_SI_ASYNCIO,
 	    LINUX_SI_MESGQ, LINUX_SI_TKILL /* SI_LWP */
 	};
 	if (code <= 0 && -code < __arraycount(si_codes))
 		return si_codes[-code];
 	return code;
+}
 int
 native_to_linux_si_status(int code, int status)
+{
 	int sts;
 	switch (code) {
 	case CLD_CONTINUED:
 		sts = LINUX_SIGCONT;
 		break;
 	case CLD_EXITED:
 		sts = WEXITSTATUS(status);
 		break;
 	case CLD_STOPPED:
 	case CLD_TRAPPED:
 	case CLD_DUMPED:
 	case CLD_KILLED:
 	default:
 		sts = native_to_linux_signo[WTERMSIG(status)];
 		break;
+	}
 	return sts;
+}

 @@ -1,14 +1,14 @@
-/* 	$NetBSD: linux_signal.h,v 1.29 2008/10/19 09:44:31 njoly Exp $	*/
+/* 	$NetBSD: linux_signal.h,v 1.30 2009/05/29 14:19:13 njoly Exp $	*/
 /*-
  * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Frank van der Linden and Eric Haszlakiewicz.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -83,18 +83,19 @@ void linux_old_to_native_sigaction(struc
     const struct linux_old_sigaction *);
 void native_to_linux_old_sigaction(struct linux_old_sigaction *,
     const struct sigaction *);
 void linux_to_native_sigaction(struct sigaction *,
     const struct linux_sigaction *);
 void native_to_linux_sigaction(struct linux_sigaction *,
     const struct sigaction *);
 void native_to_linux_sigaltstack(struct linux_sigaltstack *,
     const struct sigaltstack *);
 int native_to_linux_si_code(int);
 int native_to_linux_si_status(int, int);
 __END_DECLS
 #endif /* !_KERNEL */
 #endif /* !_LINUX_SIGNAL_H */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux32_machdep.c,v 1.21 2009/03/15 15:56:50 cegger Exp $ */
+/*	$NetBSD: linux32_machdep.c,v 1.22 2009/05/29 14:19:13 njoly Exp $ */
 /*-
  * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -21,52 +21,51 @@
  * THIS SOFTWARE IS PROVIDED BY THE THE AUTHOR AND CONTRIBUTORS ``AS IS''
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_machdep.c,v 1.21 2009/03/15 15:56:50 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_machdep.c,v 1.22 2009/05/29 14:19:13 njoly Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signalvar.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/user.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
 #include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/file.h>
 #include <sys/callout.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/msgbuf.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/device.h>
 #include <sys/syscallargs.h>
 #include <sys/filedesc.h>
 #include <sys/exec_elf.h>
 #include <sys/disklabel.h>
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 #include <miscfs/specfs/specdev.h>
 #include <machine/netbsd32_machdep.h>
 #include <compat/netbsd32/netbsd32.h>
 #include <compat/netbsd32/netbsd32_syscallargs.h>
 #include <compat/linux/common/linux_signal.h>
 #include <compat/linux/common/linux_errno.h>
 #include <compat/linux32/common/linux32_types.h>
 #include <compat/linux32/common/linux32_errno.h>
 #include <compat/linux32/common/linux32_machdep.h>
 @@ -215,31 +214,28 @@ linux32_rt_sendsig(const ksiginfo_t *ksi
 	switch (lsi->lsi_signo) {
 	case LINUX32_SIGILL:
 	case LINUX32_SIGFPE:
 	case LINUX32_SIGSEGV:
 	case LINUX32_SIGBUS:
 	case LINUX32_SIGTRAP:
 		NETBSD32PTR32(lsi->lsi_addr, ksi->ksi_addr);
 		break;
 	case LINUX32_SIGCHLD:
 		lsi->lsi_uid = ksi->ksi_uid;
 		lsi->lsi_pid = ksi->ksi_pid;
 		lsi->lsi_utime = ksi->ksi_utime;
 		lsi->lsi_stime = ksi->ksi_stime;
 		lsi->lsi_status = native_to_linux_si_status(ksi->ksi_code,
-		/* We use the same codes */
+		    ksi->ksi_status);
 		lsi->lsi_code = ksi->ksi_code;
 		/* XXX is that right? */
 		lsi->lsi_status = WEXITSTATUS(ksi->ksi_status);
 		break;
 	case LINUX32_SIGIO:
 		lsi->lsi_band = ksi->ksi_band;
 		lsi->lsi_fd = ksi->ksi_fd;
 		break;
 	default:
 		lsi->lsi_uid = ksi->ksi_uid;
 		lsi->lsi_pid = ksi->ksi_pid;
 		if (lsi->lsi_signo == LINUX32_SIGALRM ||
 		    lsi->lsi_signo >= LINUX32_SIGRTMIN)
 			NETBSD32PTR32(lsi->lsi_value.sival_ptr,
 			     ksi->ksi_value.sival_ptr);
 		break;