 @@ -1,20 +1,20 @@
-/* $NetBSD: linux32_syscall.h,v 1.39 2008/07/24 12:11:14 njoly Exp $ */
+/* $NetBSD: linux32_syscall.h,v 1.40 2008/09/22 13:08:50 njoly Exp $ */
 /*
  * System call numbers.
+ *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.36 2008/07/24 12:09:56 njoly Exp
+ * created from	NetBSD: syscalls.master,v 1.37 2008/09/22 13:07:46 njoly Exp
  */
 #ifndef _LINUX32_SYS_SYSCALL_H_
 #define	_LINUX32_SYS_SYSCALL_H_
 #define	LINUX32_SYS_MAXSYSARGS	8
 /* syscall: "syscall" ret: "int" args: */
 #define	LINUX32_SYS_syscall	0
 /* syscall: "netbsd32_exit" ret: "int" args: "int" */
 #define	LINUX32_SYS_netbsd32_exit	1
 @@ -100,28 +100,28 @@
 /* syscall: "netbsd32_access" ret: "int" args: "const netbsd32_charp" "int" */
 #define	LINUX32_SYS_netbsd32_access	33
 /* syscall: "nice" ret: "int" args: "int" */
 #define	LINUX32_SYS_nice	34
 				/* 35 is obsolete ftime */
 /* syscall: "sync" ret: "int" args: */
 #define	LINUX32_SYS_sync	36
 /* syscall: "kill" ret: "int" args: "int" "int" */
 #define	LINUX32_SYS_kill	37
-/* syscall: "rename" ret: "int" args: "const netbsd32_charp" "const netbsd32_charp" */
+/* syscall: "netbsd32___posix_rename" ret: "int" args: "const netbsd32_charp" "const netbsd32_charp" */
-#define	LINUX32_SYS_rename	38
+#define	LINUX32_SYS_netbsd32___posix_rename	38
 /* syscall: "netbsd32_mkdir" ret: "int" args: "const netbsd32_charp" "int" */
 #define	LINUX32_SYS_netbsd32_mkdir	39
 /* syscall: "netbsd32_rmdir" ret: "int" args: "const netbsd32_charp" */
 #define	LINUX32_SYS_netbsd32_rmdir	40
 /* syscall: "netbsd32_dup" ret: "int" args: "u_int" */
 #define	LINUX32_SYS_netbsd32_dup	41
 /* syscall: "pipe" ret: "int" args: "netbsd32_intp" */
 #define	LINUX32_SYS_pipe	42
 @@ -231,43 +231,43 @@
 /* syscall: "reboot" ret: "int" args: "int" "int" "int" "netbsd32_voidp" */
 #define	LINUX32_SYS_reboot	88
 /* syscall: "readdir" ret: "int" args: "int" "netbsd32_voidp" "unsigned int" */
 #define	LINUX32_SYS_readdir	89
 /* syscall: "old_mmap" ret: "int" args: "linux32_oldmmapp" */
 #define	LINUX32_SYS_old_mmap	90
 /* syscall: "netbsd32_munmap" ret: "int" args: "netbsd32_caddr_t" "int" */
 #define	LINUX32_SYS_netbsd32_munmap	91
-/* syscall: "truncate" ret: "int" args: "const netbsd32_charp" "netbsd32_long" */
+/* syscall: "compat_43_netbsd32_otruncate" ret: "int" args: "const netbsd32_charp" "netbsd32_long" */
-#define	LINUX32_SYS_truncate	92
+#define	LINUX32_SYS_compat_43_netbsd32_otruncate	92
 /* syscall: "compat_43_netbsd32_oftruncate" ret: "int" args: "int" "netbsd32_long" */
 #define	LINUX32_SYS_compat_43_netbsd32_oftruncate	93
 /* syscall: "netbsd32_fchmod" ret: "int" args: "int" "int" */
 #define	LINUX32_SYS_netbsd32_fchmod	94
 /* syscall: "fchown16" ret: "int" args: "int" "linux32_uid16_t" "linux32_gid16_t" */
 #define	LINUX32_SYS_fchown16	95
 /* syscall: "getpriority" ret: "int" args: "int" "int" */
 #define	LINUX32_SYS_getpriority	96
-/* syscall: "setpriority" ret: "int" args: "int" "int" "int" */
+/* syscall: "netbsd32_setpriority" ret: "int" args: "int" "int" "int" */
-#define	LINUX32_SYS_setpriority	97
+#define	LINUX32_SYS_netbsd32_setpriority	97
 /* syscall: "statfs" ret: "int" args: "const netbsd32_charp" "linux32_statfsp" */
 #define	LINUX32_SYS_statfs	99
 /* syscall: "socketcall" ret: "int" args: "int" "netbsd32_voidp" */
 #define	LINUX32_SYS_socketcall	102
 /* syscall: "netbsd32_setitimer" ret: "int" args: "u_int" "netbsd32_itimervalp_t" "netbsd32_itimervalp_t" */
 #define	LINUX32_SYS_netbsd32_setitimer	104
 /* syscall: "netbsd32_getitimer" ret: "int" args: "u_int" "netbsd32_itimervalp_t" */
 #define	LINUX32_SYS_netbsd32_getitimer	105

 @@ -1,20 +1,20 @@
-/* $NetBSD: linux32_syscallargs.h,v 1.39 2008/07/24 12:11:14 njoly Exp $ */
+/* $NetBSD: linux32_syscallargs.h,v 1.40 2008/09/22 13:08:50 njoly Exp $ */
 /*
  * System call argument lists.
+ *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.36 2008/07/24 12:09:56 njoly Exp
+ * created from	NetBSD: syscalls.master,v 1.37 2008/09/22 13:07:46 njoly Exp
  */
 #ifndef _LINUX32_SYS_SYSCALLARGS_H_
 #define	_LINUX32_SYS_SYSCALLARGS_H_
 #define	LINUX32_SYS_MAXSYSARGS	8
 #undef	syscallarg
 #define	syscallarg(x)							\
 	union {								\
 		register32_t pad;						\
 		struct { x datum; } le;					\
 		struct { /* LINTED zero array dimension */		\
 @@ -127,31 +127,27 @@ check_syscall_args(linux32_sys_utime)
 struct netbsd32_access_args;
 struct linux32_sys_nice_args {
 	syscallarg(int) incr;
 };
 check_syscall_args(linux32_sys_nice)
 struct linux32_sys_kill_args {
 	syscallarg(int) pid;
 	syscallarg(int) signum;
 };
 check_syscall_args(linux32_sys_kill)
-struct linux32_sys_rename_args {
+struct netbsd32___posix_rename_args;
 	syscallarg(const netbsd32_charp) from;
 	syscallarg(const netbsd32_charp) to;
 };
 check_syscall_args(linux32_sys_rename)
 struct netbsd32_mkdir_args;
 struct netbsd32_rmdir_args;
 struct netbsd32_dup_args;
 struct linux32_sys_pipe_args {
 	syscallarg(netbsd32_intp) fd;
 };
 check_syscall_args(linux32_sys_pipe)
 struct linux32_sys_times_args {
 @@ -281,55 +277,46 @@ struct linux32_sys_readdir_args {
 	syscallarg(int) fd;
 	syscallarg(netbsd32_voidp) dent;
 	syscallarg(unsigned int) count;
 };
 check_syscall_args(linux32_sys_readdir)
 struct linux32_sys_old_mmap_args {
 	syscallarg(linux32_oldmmapp) lmp;
 };
 check_syscall_args(linux32_sys_old_mmap)
 struct netbsd32_munmap_args;
-struct linux32_sys_truncate_args {
+struct compat_43_netbsd32_otruncate_args;
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(netbsd32_long) length;
 };
 check_syscall_args(linux32_sys_truncate)
 struct compat_43_netbsd32_oftruncate_args;
 struct netbsd32_fchmod_args;
 struct linux32_sys_fchown16_args {
 	syscallarg(int) fd;
 	syscallarg(linux32_uid16_t) uid;
 	syscallarg(linux32_gid16_t) gid;
 };
 check_syscall_args(linux32_sys_fchown16)
 struct linux32_sys_getpriority_args {
 	syscallarg(int) which;
 	syscallarg(int) who;
 };
 check_syscall_args(linux32_sys_getpriority)
-struct linux32_sys_setpriority_args {
+struct netbsd32_setpriority_args;
 	syscallarg(int) which;
 	syscallarg(int) who;
 	syscallarg(int) prio;
 };
 check_syscall_args(linux32_sys_setpriority)
 struct linux32_sys_statfs_args {
 	syscallarg(const netbsd32_charp) path;
 	syscallarg(linux32_statfsp) sp;
 };
 check_syscall_args(linux32_sys_statfs)
 struct linux32_sys_socketcall_args {
 	syscallarg(int) what;
 	syscallarg(netbsd32_voidp) args;
 };
 check_syscall_args(linux32_sys_socketcall)
 @@ -737,27 +724,27 @@ int	linux32_sys_alarm(struct lwp *, cons
 int	linux_sys_pause(struct lwp *, const void *, register_t *);
 int	linux32_sys_utime(struct lwp *, const struct linux32_sys_utime_args *, register_t *);
 int	netbsd32_access(struct lwp *, const struct netbsd32_access_args *, register_t *);
 int	linux32_sys_nice(struct lwp *, const struct linux32_sys_nice_args *, register_t *);
 int	sys_sync(struct lwp *, const void *, register_t *);
 int	linux32_sys_kill(struct lwp *, const struct linux32_sys_kill_args *, register_t *);
-int	linux32_sys_rename(struct lwp *, const struct linux32_sys_rename_args *, register_t *);
+int	netbsd32___posix_rename(struct lwp *, const struct netbsd32___posix_rename_args *, register_t *);
 int	netbsd32_mkdir(struct lwp *, const struct netbsd32_mkdir_args *, register_t *);
 int	netbsd32_rmdir(struct lwp *, const struct netbsd32_rmdir_args *, register_t *);
 int	netbsd32_dup(struct lwp *, const struct netbsd32_dup_args *, register_t *);
 int	linux32_sys_pipe(struct lwp *, const struct linux32_sys_pipe_args *, register_t *);
 int	linux32_sys_times(struct lwp *, const struct linux32_sys_times_args *, register_t *);
 int	linux32_sys_brk(struct lwp *, const struct linux32_sys_brk_args *, register_t *);
 @@ -821,37 +808,37 @@ int	compat_43_netbsd32_lstat43(struct lw
 int	netbsd32_readlink(struct lwp *, const struct netbsd32_readlink_args *, register_t *);
 int	linux32_sys_swapon(struct lwp *, const struct linux32_sys_swapon_args *, register_t *);
 int	linux32_sys_reboot(struct lwp *, const struct linux32_sys_reboot_args *, register_t *);
 int	linux32_sys_readdir(struct lwp *, const struct linux32_sys_readdir_args *, register_t *);
 int	linux32_sys_old_mmap(struct lwp *, const struct linux32_sys_old_mmap_args *, register_t *);
 int	netbsd32_munmap(struct lwp *, const struct netbsd32_munmap_args *, register_t *);
-int	linux32_sys_truncate(struct lwp *, const struct linux32_sys_truncate_args *, register_t *);
+int	compat_43_netbsd32_otruncate(struct lwp *, const struct compat_43_netbsd32_otruncate_args *, register_t *);
 int	compat_43_netbsd32_oftruncate(struct lwp *, const struct compat_43_netbsd32_oftruncate_args *, register_t *);
 int	netbsd32_fchmod(struct lwp *, const struct netbsd32_fchmod_args *, register_t *);
 int	linux32_sys_fchown16(struct lwp *, const struct linux32_sys_fchown16_args *, register_t *);
 int	linux32_sys_getpriority(struct lwp *, const struct linux32_sys_getpriority_args *, register_t *);
-int	linux32_sys_setpriority(struct lwp *, const struct linux32_sys_setpriority_args *, register_t *);
+int	netbsd32_setpriority(struct lwp *, const struct netbsd32_setpriority_args *, register_t *);
 int	linux32_sys_statfs(struct lwp *, const struct linux32_sys_statfs_args *, register_t *);
 int	linux32_sys_socketcall(struct lwp *, const struct linux32_sys_socketcall_args *, register_t *);
 int	netbsd32_setitimer(struct lwp *, const struct netbsd32_setitimer_args *, register_t *);
 int	netbsd32_getitimer(struct lwp *, const struct netbsd32_getitimer_args *, register_t *);
 int	linux32_sys_olduname(struct lwp *, const struct linux32_sys_olduname_args *, register_t *);
 int	linux32_sys_wait4(struct lwp *, const struct linux32_sys_wait4_args *, register_t *);

 @@ -1,24 +1,24 @@
-/* $NetBSD: linux32_syscalls.c,v 1.39 2008/07/24 12:11:14 njoly Exp $ */
+/* $NetBSD: linux32_syscalls.c,v 1.40 2008/09/22 13:08:50 njoly Exp $ */
 /*
  * System call names.
+ *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.36 2008/07/24 12:09:56 njoly Exp
+ * created from	NetBSD: syscalls.master,v 1.37 2008/09/22 13:07:46 njoly Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_syscalls.c,v 1.39 2008/07/24 12:11:14 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_syscalls.c,v 1.40 2008/09/22 13:08:50 njoly Exp $");
 #if defined(_KERNEL_OPT)
 #if defined(_KERNEL_OPT)
 #include "opt_compat_43.h"
 #endif
 #include <sys/param.h>
 #include <sys/poll.h>
 #include <sys/systm.h>
 #include <sys/signal.h>
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 #include <machine/netbsd32_machdep.h>
 #include <compat/netbsd32/netbsd32.h>
 @@ -64,27 +64,27 @@ const char *const linux32_syscallnames[]
 	/*  25 */	"stime",
 	/*  26 */	"ptrace",
 	/*  27 */	"alarm",
 	/*  28 */	"#28 (obsolete ofstat)",
 	/*  29 */	"pause",
 	/*  30 */	"utime",
 	/*  31 */	"#31 (obsolete stty)",
 	/*  32 */	"#32 (obsolete gtty)",
 	/*  33 */	"netbsd32_access",
 	/*  34 */	"nice",
 	/*  35 */	"#35 (obsolete ftime)",
 	/*  36 */	"sync",
 	/*  37 */	"kill",
-	/*  38 */	"rename",
+	/*  38 */	"netbsd32___posix_rename",
 	/*  39 */	"netbsd32_mkdir",
 	/*  40 */	"netbsd32_rmdir",
 	/*  41 */	"netbsd32_dup",
 	/*  42 */	"pipe",
 	/*  43 */	"times",
 	/*  44 */	"#44 (obsolete prof)",
 	/*  45 */	"brk",
 	/*  46 */	"linux_setgid16",
 	/*  47 */	"linux_getgid16",
 	/*  48 */	"signal",
 	/*  49 */	"linux_geteuid16",
 	/*  50 */	"linux_getegid16",
 	/*  51 */	"netbsd32_acct",
 @@ -118,32 +118,32 @@ const char *const linux32_syscallnames[]
 	/*  79 */	"settimeofday",
 	/*  80 */	"getgroups16",
 	/*  81 */	"setgroups16",
 	/*  82 */	"oldselect",
 	/*  83 */	"netbsd32_symlink",
 	/*  84 */	"compat_43_netbsd32_lstat43",
 	/*  85 */	"netbsd32_readlink",
 	/*  86 */	"#86 (unimplemented uselib)",
 	/*  87 */	"swapon",
 	/*  88 */	"reboot",
 	/*  89 */	"readdir",
 	/*  90 */	"old_mmap",
 	/*  91 */	"netbsd32_munmap",
-	/*  92 */	"truncate",
+	/*  92 */	"compat_43_netbsd32_otruncate",
 	/*  93 */	"compat_43_netbsd32_oftruncate",
 	/*  94 */	"netbsd32_fchmod",
 	/*  95 */	"fchown16",
 	/*  96 */	"getpriority",
-	/*  97 */	"setpriority",
+	/*  97 */	"netbsd32_setpriority",
 	/*  98 */	"#98 (unimplemented profil)",
 	/*  99 */	"statfs",
 	/* 100 */	"#100 (unimplemented fstatfs)",
 	/* 101 */	"#101 (unimplemented ioperm)",
 	/* 102 */	"socketcall",
 	/* 103 */	"#103 (unimplemented syslog)",
 	/* 104 */	"netbsd32_setitimer",
 	/* 105 */	"netbsd32_getitimer",
 	/* 106 */	"#106 (unimplemented stat)",
 	/* 107 */	"#107 (unimplemented lstat)",
 	/* 108 */	"#108 (unimplemented fstat)",
 	/* 109 */	"olduname",
 	/* 110 */	"#110 (unimplemented iopl)",

 @@ -1,24 +1,24 @@
-/* $NetBSD: linux32_sysent.c,v 1.39 2008/07/24 12:11:14 njoly Exp $ */
+/* $NetBSD: linux32_sysent.c,v 1.40 2008/09/22 13:08:51 njoly Exp $ */
 /*
  * System call switch table.
+ *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.36 2008/07/24 12:09:56 njoly Exp
+ * created from	NetBSD: syscalls.master,v 1.37 2008/09/22 13:07:46 njoly Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_sysent.c,v 1.39 2008/07/24 12:11:14 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_sysent.c,v 1.40 2008/09/22 13:08:51 njoly Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_compat_43.h"
 #endif
 #include <sys/param.h>
 #include <sys/poll.h>
 #include <sys/systm.h>
 #include <sys/signal.h>
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 #include <machine/netbsd32_machdep.h>
 #include <compat/netbsd32/netbsd32.h>
 #include <compat/netbsd32/netbsd32_syscallargs.h>
 @@ -104,28 +104,28 @@ struct sysent linux32_sysent[] = {
 	    linux_sys_nosys },			/* 31 = obsolete stty */
 	{ 0, 0, 0,
 	    linux_sys_nosys },			/* 32 = obsolete gtty */
 	{ ns(struct netbsd32_access_args), 0,
 	    (sy_call_t *)netbsd32_access },	/* 33 = netbsd32_access */
 	{ ns(struct linux32_sys_nice_args), 0,
 	    (sy_call_t *)linux32_sys_nice },	/* 34 = nice */
 	{ 0, 0, 0,
 	    linux_sys_nosys },			/* 35 = obsolete ftime */
 	{ 0, 0, 0,
 	    (sy_call_t *)sys_sync },		/* 36 = sync */
 	{ ns(struct linux32_sys_kill_args), 0,
 	    (sy_call_t *)linux32_sys_kill },	/* 37 = kill */
-	{ ns(struct linux32_sys_rename_args), 0,
+	{ ns(struct netbsd32___posix_rename_args), 0,
-	    (sy_call_t *)linux32_sys_rename },	/* 38 = rename */
+	    (sy_call_t *)netbsd32___posix_rename },/* 38 = netbsd32___posix_rename */
 	{ ns(struct netbsd32_mkdir_args), 0,
 	    (sy_call_t *)netbsd32_mkdir },	/* 39 = netbsd32_mkdir */
 	{ ns(struct netbsd32_rmdir_args), 0,
 	    (sy_call_t *)netbsd32_rmdir },	/* 40 = netbsd32_rmdir */
 	{ ns(struct netbsd32_dup_args), 0,
 	    (sy_call_t *)netbsd32_dup },	/* 41 = netbsd32_dup */
 	{ ns(struct linux32_sys_pipe_args), 0,
 	    (sy_call_t *)linux32_sys_pipe },	/* 42 = pipe */
 	{ ns(struct linux32_sys_times_args), 0,
 	    (sy_call_t *)linux32_sys_times },	/* 43 = times */
 	{ 0, 0, 0,
 	    linux_sys_nosys },			/* 44 = obsolete prof */
 	{ ns(struct linux32_sys_brk_args), 0,
 @@ -212,38 +212,38 @@ struct sysent linux32_sysent[] = {
 	    (sy_call_t *)netbsd32_readlink },	/* 85 = netbsd32_readlink */
 	{ 0, 0, 0,
 	    linux_sys_nosys },			/* 86 = unimplemented uselib */
 	{ ns(struct linux32_sys_swapon_args), 0,
 	    (sy_call_t *)linux32_sys_swapon },	/* 87 = swapon */
 	{ ns(struct linux32_sys_reboot_args), 0,
 	    (sy_call_t *)linux32_sys_reboot },	/* 88 = reboot */
 	{ ns(struct linux32_sys_readdir_args), 0,
 	    (sy_call_t *)linux32_sys_readdir },	/* 89 = readdir */
 	{ ns(struct linux32_sys_old_mmap_args), 0,
 	    (sy_call_t *)linux32_sys_old_mmap },/* 90 = old_mmap */
 	{ ns(struct netbsd32_munmap_args), 0,
 	    (sy_call_t *)netbsd32_munmap },	/* 91 = netbsd32_munmap */
-	{ ns(struct linux32_sys_truncate_args), 0,
+	{ ns(struct compat_43_netbsd32_otruncate_args), 0,
-	    (sy_call_t *)linux32_sys_truncate },/* 92 = truncate */
+	    (sy_call_t *)compat_43_netbsd32_otruncate },/* 92 = compat_43_netbsd32_otruncate */
 	{ ns(struct compat_43_netbsd32_oftruncate_args), 0,
 	    (sy_call_t *)compat_43_netbsd32_oftruncate },/* 93 = compat_43_netbsd32_oftruncate */
 	{ ns(struct netbsd32_fchmod_args), 0,
 	    (sy_call_t *)netbsd32_fchmod },	/* 94 = netbsd32_fchmod */
 	{ ns(struct linux32_sys_fchown16_args), 0,
 	    (sy_call_t *)linux32_sys_fchown16 },/* 95 = fchown16 */
 	{ ns(struct linux32_sys_getpriority_args), 0,
 	    (sy_call_t *)linux32_sys_getpriority },/* 96 = getpriority */
-	{ ns(struct linux32_sys_setpriority_args), 0,
+	{ ns(struct netbsd32_setpriority_args), 0,
-	    (sy_call_t *)linux32_sys_setpriority },/* 97 = setpriority */
+	    (sy_call_t *)netbsd32_setpriority },/* 97 = netbsd32_setpriority */
 	{ 0, 0, 0,
 	    linux_sys_nosys },			/* 98 = unimplemented profil */
 	{ ns(struct linux32_sys_statfs_args), 0,
 	    (sy_call_t *)linux32_sys_statfs },	/* 99 = statfs */
 	{ 0, 0, 0,
 	    linux_sys_nosys },			/* 100 = unimplemented fstatfs */
 	{ 0, 0, 0,
 	    linux_sys_nosys },			/* 101 = unimplemented ioperm */
 	{ ns(struct linux32_sys_socketcall_args), 0,
 	    (sy_call_t *)linux32_sys_socketcall },/* 102 = socketcall */
 	{ 0, 0, 0,
 	    linux_sys_nosys },			/* 103 = unimplemented syslog */
 	{ ns(struct netbsd32_setitimer_args), 0,