 @@ -1,14 +1,14 @@
-/*	$NetBSD: netbsd32_netbsd.c,v 1.147 2008/11/19 18:36:05 ad Exp $	*/
+/*	$NetBSD: netbsd32_netbsd.c,v 1.148 2008/11/20 11:56:40 tron Exp $	*/
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
  * 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.
 @@ -17,27 +17,27 @@
  * 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 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: netbsd32_netbsd.c,v 1.147 2008/11/19 18:36:05 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.148 2008/11/20 11:56:40 tron Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_ddb.h"
 #include "opt_ntp.h"
 #include "opt_compat_netbsd.h"
 #include "opt_compat_43.h"
 #include "opt_sysv.h"
 #include "opt_syscall_debug.h"
 #include "opt_sa.h"
 #include "fs_lfs.h"
 #endif
 @@ -164,27 +164,31 @@ struct emul emul_netbsd32 = {
 	NULL,
 	NULL,
 	NULL,
 #ifdef __HAVE_SYSCALL_INTERN
 	netbsd32_syscall_intern,
 #else
 	syscall,
 #endif
 	&netbsd32_sysctl_root,
 	NULL,
 	netbsd32_vm_default_addr,
 	NULL,
 #ifdef COMPAT_40
 	&saemul_netbsd32,
 #else
 	NULL,
 #endif
 	sizeof(ucontext32_t),
 	startlwp32,
 };
 /*
  * below are all the standard NetBSD system calls, in the 32bit
  * environment, with the necessary conversions to 64bit before
  * calling the real syscall.  anything that needs special
  * attention is handled elsewhere.
  */
 int
 netbsd32_exit(struct lwp *l, const struct netbsd32_exit_args *uap, register_t *retval)
 @@ -367,39 +371,43 @@ netbsd32_break(struct lwp *l, const stru
 	/* {
 		syscallarg(netbsd32_charp) nsize;
 	} */
 	struct sys_obreak_args ua;
 	SCARG(&ua, nsize) = SCARG_P32(uap, nsize);
 	NETBSD32TOP_UAP(nsize, char);
 	return (sys_obreak(l, &ua, retval));
+}
 int
 netbsd32_mount(struct lwp *l, const struct netbsd32_mount_args *uap, register_t *retval)
+{
 #ifdef COMPAT_40
 	/* {
 		syscallarg(const netbsd32_charp) type;
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(int) flags;
 		syscallarg(netbsd32_voidp) data;
 	} */
 	struct compat_40_sys_mount_args ua;
 	NETBSD32TOP_UAP(type, const char);
 	NETBSD32TOP_UAP(path, const char);
 	NETBSD32TO64_UAP(flags);
 	NETBSD32TOP_UAP(data, void);
 	return (compat_40_sys_mount(l, &ua, retval));
 #else
 	return ENOSYS;
 #endif
+}
 int
 netbsd32_unmount(struct lwp *l, const struct netbsd32_unmount_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(int) flags;
 	} */
 	struct sys_unmount_args ua;
 	NETBSD32TOP_UAP(path, const char);
 	NETBSD32TO64_UAP(flags);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: netbsd32_sa.c,v 1.7 2008/10/15 06:52:38 wrstuden Exp $	*/
+/*	$NetBSD: netbsd32_sa.c,v 1.8 2008/11/20 11:56:40 tron Exp $	*/
 /*
  *  Copyright (c) 2005 The NetBSD Foundation.
  *  All rights reserved.
+ *
  *  This code is derived from software contributed to the NetBSD Foundation
  *   by Quentin Garnier.
+ *
  *  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.
 @@ -23,27 +23,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: netbsd32_sa.c,v 1.7 2008/10/15 06:52:38 wrstuden Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sa.c,v 1.8 2008/11/20 11:56:40 tron Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/dirent.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/sa.h>
 #include <sys/savar.h>
 #include <sys/syscallargs.h>
 #include <compat/netbsd32/netbsd32.h>
 @@ -122,80 +122,90 @@ void *
 netbsd32_sa_ucsp(void *arg)
+{
 	ucontext32_t *uc32 = arg;
 	return NETBSD32IPTR64(_UC_MACHINE32_SP(uc32));
+}
 /* Sycalls conversion */
 int
 netbsd32_sa_register(struct lwp *l,
     const struct netbsd32_sa_register_args *uap, register_t *retval)
+{
 #ifdef COMPAT_40
 	/* {
 		syscallarg(netbsd32_sa_upcall_t) new;
 		syscallarg(netbsd32_sa_upcallp_t) old;
 		syscallarg(int) flags;
 		syscallarg(netbsd32_ssize_t) stackinfo_offset;
 	} */
 	sa_upcall_t prev;
 	int error;
 	error = dosa_register(l, NETBSD32PTR64(SCARG(uap, new)), &prev,
 	    SCARG(uap, flags), SCARG(uap, stackinfo_offset));
 	if (error)
 		return error;
 	if (NETBSD32PTR64(SCARG(uap, old))) {
 		netbsd32_sa_upcall_t old;
 		NETBSD32PTR32(old, prev);
 		return copyout(&old, NETBSD32PTR64(SCARG(uap, old)),
 		    sizeof(old));
+	}
 	return 0;
 #else
 	return ENOSYS;
 #endif
+}
 #ifdef COMPAT_40
 static int
 netbsd32_sa_copyin_stack(stack_t *stacks, int index, stack_t *dest)
+{
 	stack32_t s32, *stacks32;
 	int error;
 	stacks32 = (stack32_t *)stacks;
 	error = copyin(stacks32 + index, &s32, sizeof(s32));
 	if (error)
 		return error;
  	dest->ss_sp = NETBSD32IPTR64(s32.ss_sp);
 	dest->ss_size = s32.ss_size;
 	dest->ss_flags = s32.ss_flags;
 	return 0;
+}
 #endif
 int
 netbsd32_sa_stacks(struct lwp *l, const struct netbsd32_sa_stacks_args *uap,
     register_t *retval)
+{
 #ifdef COMPAT_40
 	 /* {
 		syscallarg(int) num;
 		syscallarg(netbsd32_stackp_t) stacks;
 	} */
 	return sa_stacks1(l, retval, SCARG(uap, num),
 	    NETBSD32PTR64(SCARG(uap, stacks)), netbsd32_sa_copyin_stack);
 #else
 	return ENOSYS;
 #endif
+}
 int
 netbsd32_sa_setconcurrency(struct lwp *l,
     const struct netbsd32_sa_setconcurrency_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) concurrency;
 	} */
 	struct sys_sa_setconcurrency_args ua;
 	NETBSD32TO64_UAP(concurrency);
 	return sys_sa_setconcurrency(l, &ua, retval);