 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux32_machdep.c,v 1.20 2008/10/19 09:44:31 njoly Exp $ */
+/*	$NetBSD: linux32_machdep.c,v 1.21 2009/03/15 15:56:50 cegger 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,27 +21,27 @@
  * 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.20 2008/10/19 09:44:31 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_machdep.c,v 1.21 2009/03/15 15:56:50 cegger 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>
 @@ -345,31 +345,28 @@ linux32_setregs(struct lwp *l, struct ex
 static void
 linux32_save_ucontext(struct lwp *l, struct trapframe *tf, const sigset_t *mask, struct sigaltstack *sas, struct linux32_ucontext *uc)
+{
 	uc->uc_flags = 0;
 	NETBSD32PTR32(uc->uc_link, NULL);
 	native_to_linux32_sigaltstack(&uc->uc_stack, sas);
 	linux32_save_sigcontext(l, tf, mask, &uc->uc_mcontext);
 	native_to_linux32_sigset(&uc->uc_sigmask, mask);
 	(void)memset(&uc->uc_fpregs_mem, 0, sizeof(uc->uc_fpregs_mem));
+}
 static void
-linux32_save_sigcontext(l, tf, mask, sc)
+linux32_save_sigcontext(struct lwp *l, struct trapframe *tf,
-	struct lwp *l;
+			const sigset_t *mask, struct linux32_sigcontext *sc)
 	struct trapframe *tf;
 	const sigset_t *mask;
 	struct linux32_sigcontext *sc;
+{
 	/* Save register context. */
 	sc->sc_gs = tf->tf_gs;
 	sc->sc_fs = tf->tf_fs;
 	sc->sc_es = tf->tf_es;
 	sc->sc_ds = tf->tf_ds;
 	sc->sc_eflags = tf->tf_rflags;
 	sc->sc_edi = tf->tf_rdi;
 	sc->sc_esi = tf->tf_rsi;
 	sc->sc_esp = tf->tf_rsp;
 	sc->sc_ebp = tf->tf_rbp;
 	sc->sc_ebx = tf->tf_rbx;
 	sc->sc_edx = tf->tf_rdx;
 @@ -412,30 +409,28 @@ linux32_sys_rt_sigreturn(struct lwp *l,
 	/* {
 		syscallarg(linux32_ucontextp_t) ucp;
 	} */
 	struct linux32_ucontext ctx;
 	int error;
 	if ((error = copyin(SCARG_P32(uap, ucp), &ctx, sizeof(ctx))) != 0)
 		return error;
 	return linux32_restore_sigcontext(l, &ctx.uc_mcontext, retval);
+}
 static int
-linux32_restore_sigcontext(l, scp, retval)
+linux32_restore_sigcontext(struct lwp *l, struct linux32_sigcontext *scp,
-	struct lwp *l;
+			register_t *retval)
 	struct linux32_sigcontext *scp;
 	register_t *retval;
+{
 	struct trapframe *tf;
 	struct proc *p = l->l_proc;
 	struct sigaltstack *sas = &l->l_sigstk;
 	sigset_t mask;
 	ssize_t ss_gap;
 	/* Restore register context. */
 	tf = l->l_md.md_regs;
 	/*
 	 * Check for security violations.  If we're returning to
 	 * protected mode, the CPU will validate the segment registers

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux32_exec_elf32.c,v 1.8 2008/04/28 20:23:44 martin Exp $ */
+/*	$NetBSD: linux32_exec_elf32.c,v 1.9 2009/03/15 15:56:50 cegger Exp $ */
 /*-
  * Copyright (c) 1995, 1998, 2000, 2001,2006 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas, Frank van der Linden, Eric Haszlakiewicz and
  * Emmanuel Dreyfus.
+ *
  * 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
 @@ -21,27 +21,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: linux32_exec_elf32.c,v 1.8 2008/04/28 20:23:44 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_exec_elf32.c,v 1.9 2009/03/15 15:56:50 cegger Exp $");
 #define	ELFSIZE		32
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/vnode.h>
 #include <sys/exec.h>
 #include <sys/exec_elf.h>
 #include <sys/kauth.h>
 #include <sys/kernel.h>
 #include <sys/resourcevar.h>
 @@ -55,32 +55,28 @@ __KERNEL_RCSID(0, "$NetBSD: linux32_exec
 #include <machine/frame.h>
 #ifdef DEBUG_LINUX
 #define DPRINTF(a)      uprintf a
 #else
 #define DPRINTF(a)
 #endif
 int linux32_copyinargs(struct exec_package *, struct ps_strings *,
 			void *, size_t, const void *, const void *);
 int
-ELFNAME2(linux32,probe)(l, epp, eh, itp, pos)
+ELFNAME2(linux32,probe)(struct lwp *l, struct exec_package *epp,
-	struct lwp *l;
+			void *eh, char *itp, vaddr_t *pos)
 	struct exec_package *epp;
 	void *eh;
 	char *itp;
 	vaddr_t *pos;
+{
 	int error;
 	if (((error = ELFNAME2(linux,signature)(l, epp, eh, itp)) != 0) &&
 #ifdef LINUX32_GCC_SIGNATURE
 	    ((error = ELFNAME2(linux,gcc_signature)(l, epp, eh)) != 0) &&
 #endif
 #ifdef LINUX32_ATEXIT_SIGNATURE
 	    ((error = ELFNAME2(linux,atexit_signature)(l, epp, eh)) != 0) &&
 #endif
 #ifdef LINUX32_DEBUGLINK_SIGNATURE
 	    ((error = ELFNAME2(linux,debuglink_signature)(l, epp, eh)) != 0) &&
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux32_unistd.c,v 1.30 2009/01/16 13:10:47 njoly Exp $ */
+/*	$NetBSD: linux32_unistd.c,v 1.31 2009/03/15 15:56:50 cegger 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
 @@ -23,27 +23,27 @@
  * 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_unistd.c,v 1.30 2009/01/16 13:10:47 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_unistd.c,v 1.31 2009/03/15 15:56:50 cegger Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/fstypes.h>
 #include <sys/signal.h>
 #include <sys/dirent.h>
 #include <sys/kernel.h>
 #include <sys/fcntl.h>
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/ucred.h>
 #include <sys/swap.h>
 #include <sys/kauth.h>
 @@ -133,32 +133,29 @@ linux32_sys_oldselect(struct lwp *l, con
 	} */
 	struct linux32_oldselect lsp32;
 	int error;
 	if ((error = copyin(SCARG_P32(uap, lsp), &lsp32, sizeof(lsp32))) != 0)
 		return error;
 	return linux32_select1(l, retval, lsp32.nfds,
 	     NETBSD32PTR64(lsp32.readfds), NETBSD32PTR64(lsp32.writefds),
 	     NETBSD32PTR64(lsp32.exceptfds), NETBSD32PTR64(lsp32.timeout));
+}
 static int
-linux32_select1(l, retval, nfds, readfds, writefds, exceptfds, timeout)
+linux32_select1(struct lwp *l, register_t *retval, int nfds,
-        struct lwp *l;
+		fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
-        register_t *retval;
+		struct timeval *timeout)
         int nfds;
         fd_set *readfds, *writefds, *exceptfds;
         struct timeval *timeout;
+{
 	struct timeval tv0, tv1, utv, *tv = NULL;
 	struct netbsd32_timeval50 utv32;
 	int error;
 	timerclear(&utv); /* XXX GCC4 */
 	/*
 	 * Store current time for computation of the amount of
 	 * time left.
 	 */
 	if (timeout) {
 		if ((error = copyin(timeout, &utv32, sizeof(utv32))))