 @@ -1,14 +1,14 @@
-/*	$NetBSD: netbsd32_netbsd.c,v 1.168.4.1 2011/01/20 14:24:55 bouyer Exp $	*/
+/*	$NetBSD: netbsd32_netbsd.c,v 1.168.4.2 2011/02/09 16:09:55 bouyer Exp $	*/
 /*
  * Copyright (c) 1998, 2001, 2008 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.168.4.1 2011/01/20 14:24:55 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.168.4.2 2011/02/09 16:09:55 bouyer 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"
 #endif
 /*
  * Though COMPAT_OLDSOCK is needed only for COMPAT_43, SunOS, Linux,
 @@ -1175,51 +1175,51 @@ netbsd32_mkdir(struct lwp *l, const stru
 int
 netbsd32_rmdir(struct lwp *l, const struct netbsd32_rmdir_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_charp) path;
 	} */
 	struct sys_rmdir_args ua;
 	NETBSD32TOP_UAP(path, const char);
 	return (sys_rmdir(l, &ua, retval));
+}
 int
-netbsd32_quotactl50(struct lwp *l, const struct netbsd32_quotactl_args *uap, register_t *retval)
+compat_50_netbsd32_quotactl(struct lwp *l, const struct compat_50_netbsd32_quotactl_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(int) cmd;
 		syscallarg(int) uid;
 		syscallarg(netbsd32_voidp) arg;
 	} */
-	struct sys_quotactl_args ua;
+	struct compat_50_sys_quotactl_args ua;
 	NETBSD32TOP_UAP(path, const char);
 	NETBSD32TO64_UAP(cmd);
 	NETBSD32TO64_UAP(uid);
 	NETBSD32TOP_UAP(arg, void *);
-	return (sys_quotactl50(l, &ua, retval));
+	return (compat_50_sys_quotactl(l, &ua, retval));
+}
 int
-netbsd32_quotactl(struct lwp *l, const struct netbsd32_quotactl_args *uap, register_t *retval)
+netbsd32___quotactl50(struct lwp *l, const struct netbsd32___quotactl50_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(const netbsd32_charp) path;
 		syscallarg(void *) v;
 	} */
-	struct sys_quotactl_args ua;
+	//struct sys___quotactl50_args ua;
 	return EOPNOTSUPP;
 #if 0
 	NETBSD32TOP_UAP(path, const char);
 	NETBSD32TO64_UAP(cmd);
 	NETBSD32TO64_UAP(uid);
 	NETBSD32TOP_UAP(arg, void *);
 	return (sys_quotactl(l, &ua, retval));
 #endif
+}
 int
 netbsd32___getfh30(struct lwp *l, const struct netbsd32___getfh30_args *uap, register_t *retval)

 @@ -1,14 +1,14 @@
-	$NetBSD: syscalls.master,v 1.84.6.1 2011/01/20 14:24:56 bouyer Exp $
+	$NetBSD: syscalls.master,v 1.84.6.2 2011/02/09 16:09:55 bouyer Exp $
 ;	from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
 ; NetBSD system call name/number "master" file.
 ; (See syscalls.conf to see what it is processed into.)
+;
 ; Fields: number type [type-dependent ...]
 ;	number	system call number, must be in order
 ;	type	one of STD, OBSOL, UNIMPL, IGNORED, NODEF, NOARGS, or one of
 ;		the compatibility options defined in syscalls.conf.
+;
 ; types:
 @@ -294,27 +294,27 @@
 	OBSOL		4.2 sigreturn
 	COMPAT_50	{ int|netbsd32||adjtime(netbsd32_timeval50p_t delta, \
 			    netbsd32_timeval50p_t olddelta); }
 	COMPAT_43	{ int|netbsd32||ogetpeername(int fdes, \
 			    netbsd32_voidp asa, netbsd32_intp alen); }
 	COMPAT_43	{ int32_t|sys||gethostid(void); } ogethostid
 	COMPAT_43	{ int|netbsd32||sethostid(int32_t hostid); }
 	COMPAT_43	{ int|netbsd32||ogetrlimit(int which, \
 			    netbsd32_orlimitp_t rlp); }
 	COMPAT_43	{ int|netbsd32||osetrlimit(int which, \
 			    netbsd32_orlimitp_t rlp); }
 	COMPAT_43	{ int|netbsd32||killpg(int pgid, int signum); }
 	NOARGS		{ int|sys||setsid(void); }
-	COMPAT_50	{ int|netbsd32||quotactl50(netbsd32_charp path, int cmd, \
+	COMPAT_50	{ int|netbsd32||quotactl(netbsd32_charp path, int cmd, \
 			    int uid, netbsd32_voidp arg); }
 	COMPAT_43	{ int|sys||quota(void); } oquota
 	COMPAT_43	{ int|netbsd32||ogetsockname(int fdec, \
 			    netbsd32_voidp asa, netbsd32_intp alen); }
 ; Syscalls 151-180 inclusive are reserved for vendor-specific
 ; system calls.  (This includes various calls added for compatibity
 ; with other Unix variants.)
 ; Some of these calls are now supported by BSD...
 	UNIMPL
 	UNIMPL
 	UNIMPL
 	UNIMPL
 @@ -959,15 +959,15 @@
 #if defined(NTP) || !defined(_KERNEL_OPT)
 	STD		{ int|netbsd32|50|ntp_gettime( \
 			    netbsd32_ntptimevalp_t ntvp); }
 #else
 	EXCL		___ntp_gettime50
 #endif
 	STD 		{ int|netbsd32|50|wait4(int pid, \
 			    netbsd32_intp status, \
 			    int options, netbsd32_rusagep_t rusage); }
 	STD 		{ int|netbsd32|50|mknod(const netbsd32_charp path, \
 			    mode_t mode, netbsd32_dev_t dev); }
 	STD	 	{ int|netbsd32|50|fhstat(const netbsd32_voidp fhp, \
 			    netbsd32_size_t fh_size, netbsd32_statp_t sb); }
-	STD		{ int|sys||quotactl(const char *path, \
+	STD		{ int|netbsd32|50|quotactl(const netbsd32_charp path, \
 			    netbsd32_voidp pref); }