regen

4 files changed, 66 insertions, 40 deletions

diff --git a/sys/compat/linux/linux_syscall.h b/sys/compat/linux/linux_syscall.h
index 9107ecf3cea..17f3661d6f1 100644
--- a/sys/compat/linux/linux_syscall.h
+++ b/sys/compat/linux/linux_syscall.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: linux_syscall.h,v 1.75 2013/08/13 05:54:10 guenther Exp $	*/
+/*	$OpenBSD: linux_syscall.h,v 1.76 2013/10/25 04:52:16 guenther Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.72 2013/08/13 05:52:22 guenther Exp 
+ * created from	OpenBSD: syscalls.master,v 1.73 2013/10/25 04:51:39 guenther Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: */
@@ -136,7 +136,7 @@
 /* syscall: "pipe" ret: "int" args: "int *" */
 #define	LINUX_SYS_pipe	42
 
-/* syscall: "times" ret: "int" args: "struct times *" */
+/* syscall: "times" ret: "int" args: "struct linux_tms *" */
 #define	LINUX_SYS_times	43
 
 /* syscall: "prof" ret: "int" args: */
@@ -238,10 +238,10 @@
 /* syscall: "getrlimit" ret: "int" args: "u_int" "struct linux_rlimit *" */
 #define	LINUX_SYS_getrlimit	76
 
-/* syscall: "getrusage" ret: "int" args: "int" "struct rusage *" */
+/* syscall: "getrusage" ret: "int" args: "int" "struct linux_rusage *" */
 #define	LINUX_SYS_getrusage	77
 
-/* syscall: "gettimeofday" ret: "int" args: "struct timeval *" "struct timezone *" */
+/* syscall: "gettimeofday" ret: "int" args: "struct linux_timeval *" "struct timezone *" */
 #define	LINUX_SYS_gettimeofday	78
 
 /* syscall: "settimeofday" ret: "int" args: "struct timeval *" "struct timezone *" */
@@ -322,10 +322,10 @@
 /* syscall: "klog" ret: "int" args: */
 #define	LINUX_SYS_klog	103
 
-/* syscall: "setitimer" ret: "int" args: "u_int" "struct itimerval *" "struct itimerval *" */
+/* syscall: "setitimer" ret: "int" args: "u_int" "struct linux_itimerval *" "struct linux_itimerval *" */
 #define	LINUX_SYS_setitimer	104
 
-/* syscall: "getitimer" ret: "int" args: "u_int" "struct itimerval *" */
+/* syscall: "getitimer" ret: "int" args: "u_int" "struct linux_itimerval *" */
 #define	LINUX_SYS_getitimer	105
 
 /* syscall: "stat" ret: "int" args: "char *" "struct linux_stat *" */
@@ -355,13 +355,13 @@
 /* syscall: "vm86old" ret: "int" args: */
 #define	LINUX_SYS_vm86old	113
 
-/* syscall: "wait4" ret: "int" args: "int" "int *" "int" "struct rusage *" */
+/* syscall: "wait4" ret: "int" args: "int" "int *" "int" "struct linux_rusage *" */
 #define	LINUX_SYS_wait4	114
 
 /* syscall: "swapoff" ret: "int" args: */
 #define	LINUX_SYS_swapoff	115
 
-/* syscall: "sysinfo" ret: "int" args: "struct linux_sys_sysinfo_args *" */
+/* syscall: "sysinfo" ret: "int" args: "struct linux_sysinfo *" */
 #define	LINUX_SYS_sysinfo	116
 
 /* syscall: "ipc" ret: "int" args: "int" "int" "int" "int" "caddr_t" */
@@ -442,7 +442,7 @@
 /* syscall: "getdents" ret: "int" args: "int" "void *" "unsigned" */
 #define	LINUX_SYS_getdents	141
 
-/* syscall: "select" ret: "int" args: "int" "fd_set *" "fd_set *" "fd_set *" "struct timeval *" */
+/* syscall: "select" ret: "int" args: "int" "fd_set *" "fd_set *" "fd_set *" "struct linux_timeval *" */
 #define	LINUX_SYS_select	142
 
 /* syscall: "flock" ret: "int" args: "int" "int" */
@@ -502,7 +502,7 @@
 /* syscall: "sched_rr_get_interval" ret: "int" args: */
 #define	LINUX_SYS_sched_rr_get_interval	161
 
-/* syscall: "nanosleep" ret: "int" args: "const struct timespec32 *" "struct timespec32 *" */
+/* syscall: "nanosleep" ret: "int" args: "const struct linux_timespec *" "struct linux_timespec *" */
 #define	LINUX_SYS_nanosleep	162
 
 /* syscall: "mremap" ret: "int" args: "void *" "size_t" "size_t" "long" */
@@ -748,10 +748,10 @@
 /* syscall: "set_tid_address" ret: "int" args: "void *" */
 #define	LINUX_SYS_set_tid_address	258
 
-/* syscall: "clock_gettime" ret: "int" args: "clockid_t" "struct l_timespec *" */
+/* syscall: "clock_gettime" ret: "int" args: "clockid_t" "struct linux_timespec *" */
 #define	LINUX_SYS_clock_gettime	265
 
-/* syscall: "clock_getres" ret: "int" args: "clockid_t" "struct l_timespec *" */
+/* syscall: "clock_getres" ret: "int" args: "clockid_t" "struct linux_timespec *" */
 #define	LINUX_SYS_clock_getres	266
 
 /* syscall: "statfs64" ret: "int" args: "char *" "struct linux_statfs64 *" */
diff --git a/sys/compat/linux/linux_syscallargs.h b/sys/compat/linux/linux_syscallargs.h
index cd40b749fda..9344af90ca2 100644
--- a/sys/compat/linux/linux_syscallargs.h
+++ b/sys/compat/linux/linux_syscallargs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: linux_syscallargs.h,v 1.77 2013/08/13 05:54:10 guenther Exp $	*/
+/*	$OpenBSD: linux_syscallargs.h,v 1.78 2013/10/25 04:52:16 guenther Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.72 2013/08/13 05:52:22 guenther Exp 
+ * created from	OpenBSD: syscalls.master,v 1.73 2013/10/25 04:51:39 guenther Exp 
  */
 
 #ifdef	syscallarg
@@ -139,7 +139,7 @@ struct linux_sys_rmdir_args {
 };
 
 struct linux_sys_times_args {
-	syscallarg(struct times *) tms;
+	syscallarg(struct linux_tms *) tms;
 };
 
 struct linux_sys_brk_args {
@@ -212,6 +212,16 @@ struct linux_sys_getrlimit_args {
 	syscallarg(struct linux_rlimit *) rlp;
 };
 
+struct linux_sys_getrusage_args {
+	syscallarg(int) who;
+	syscallarg(struct linux_rusage *) rusage;
+};
+
+struct linux_sys_gettimeofday_args {
+	syscallarg(struct linux_timeval *) tp;
+	syscallarg(struct timezone *) tzp;
+};
+
 struct linux_sys_oldselect_args {
 	syscallarg(struct linux_select *) lsp;
 };
@@ -282,6 +292,17 @@ struct linux_sys_socketcall_args {
 	syscallarg(void *) args;
 };
 
+struct linux_sys_setitimer_args {
+	syscallarg(u_int) which;
+	syscallarg(struct linux_itimerval *) itv;
+	syscallarg(struct linux_itimerval *) oitv;
+};
+
+struct linux_sys_getitimer_args {
+	syscallarg(u_int) which;
+	syscallarg(struct linux_itimerval *) itv;
+};
+
 struct linux_sys_stat_args {
 	syscallarg(char *) path;
 	syscallarg(struct linux_stat *) sp;
@@ -309,11 +330,11 @@ struct linux_sys_wait4_args {
 	syscallarg(int) pid;
 	syscallarg(int *) status;
 	syscallarg(int) options;
-	syscallarg(struct rusage *) rusage;
+	syscallarg(struct linux_rusage *) rusage;
 };
 
 struct linux_sys_sysinfo_args {
-	syscallarg(struct linux_sys_sysinfo_args *) sysinfo;
+	syscallarg(struct linux_sysinfo *) sysinfo;
 };
 
 struct linux_sys_ipc_args {
@@ -390,7 +411,7 @@ struct linux_sys_select_args {
 	syscallarg(fd_set *) readfds;
 	syscallarg(fd_set *) writefds;
 	syscallarg(fd_set *) exceptfds;
-	syscallarg(struct timeval *) timeout;
+	syscallarg(struct linux_timeval *) timeout;
 };
 
 struct linux_sys_fdatasync_args {
@@ -429,6 +450,11 @@ struct linux_sys_sched_get_priority_min_args {
 	syscallarg(int) policy;
 };
 
+struct linux_sys_nanosleep_args {
+	syscallarg(const struct linux_timespec *) rqtp;
+	syscallarg(struct linux_timespec *) rmtp;
+};
+
 struct linux_sys_mremap_args {
 	syscallarg(void *) old_address;
 	syscallarg(size_t) old_size;
@@ -605,12 +631,12 @@ struct linux_sys_set_tid_address_args {
 
 struct linux_sys_clock_gettime_args {
 	syscallarg(clockid_t) which;
-	syscallarg(struct l_timespec *) tp;
+	syscallarg(struct linux_timespec *) tp;
 };
 
 struct linux_sys_clock_getres_args {
 	syscallarg(clockid_t) which;
-	syscallarg(struct l_timespec *) tp;
+	syscallarg(struct linux_timespec *) tp;
 };
 
 struct linux_sys_statfs64_args {
@@ -732,8 +758,8 @@ int	linux_sys_sigpending(struct proc *, void *, register_t *);
 int	linux_sys_sethostname(struct proc *, void *, register_t *);
 int	linux_sys_setrlimit(struct proc *, void *, register_t *);
 int	linux_sys_getrlimit(struct proc *, void *, register_t *);
-int	sys_getrusage(struct proc *, void *, register_t *);
-int	t32_sys_gettimeofday(struct proc *, void *, register_t *);
+int	linux_sys_getrusage(struct proc *, void *, register_t *);
+int	linux_sys_gettimeofday(struct proc *, void *, register_t *);
 int	sys_settimeofday(struct proc *, void *, register_t *);
 int	sys_getgroups(struct proc *, void *, register_t *);
 int	sys_setgroups(struct proc *, void *, register_t *);
@@ -763,8 +789,8 @@ int	linux_sys_ioperm(struct proc *, void *, register_t *);
 #endif
 int	linux_sys_socketcall(struct proc *, void *, register_t *);
 int	linux_sys_klog(struct proc *, void *, register_t *);
-int	sys_setitimer(struct proc *, void *, register_t *);
-int	sys_getitimer(struct proc *, void *, register_t *);
+int	linux_sys_setitimer(struct proc *, void *, register_t *);
+int	linux_sys_getitimer(struct proc *, void *, register_t *);
 int	linux_sys_stat(struct proc *, void *, register_t *);
 int	linux_sys_lstat(struct proc *, void *, register_t *);
 int	linux_sys_fstat(struct proc *, void *, register_t *);
@@ -829,7 +855,7 @@ int	linux_sys_sched_yield(struct proc *, void *, register_t *);
 int	linux_sys_sched_get_priority_max(struct proc *, void *, register_t *);
 int	linux_sys_sched_get_priority_min(struct proc *, void *, register_t *);
 int	linux_sys_sched_rr_get_interval(struct proc *, void *, register_t *);
-int	t32_sys_nanosleep(struct proc *, void *, register_t *);
+int	linux_sys_nanosleep(struct proc *, void *, register_t *);
 int	linux_sys_mremap(struct proc *, void *, register_t *);
 int	linux_sys_setresuid16(struct proc *, void *, register_t *);
 int	linux_sys_getresuid16(struct proc *, void *, register_t *);
diff --git a/sys/compat/linux/linux_syscalls.c b/sys/compat/linux/linux_syscalls.c
index 1539a65b53b..8cf9e8118d3 100644
--- a/sys/compat/linux/linux_syscalls.c
+++ b/sys/compat/linux/linux_syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: linux_syscalls.c,v 1.75 2013/08/13 05:54:11 guenther Exp $	*/
+/*	$OpenBSD: linux_syscalls.c,v 1.76 2013/10/25 04:52:16 guenther Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.72 2013/08/13 05:52:22 guenther Exp 
+ * created from	OpenBSD: syscalls.master,v 1.73 2013/10/25 04:51:39 guenther Exp 
  */
 
 char *linux_syscallnames[] = {
diff --git a/sys/compat/linux/linux_sysent.c b/sys/compat/linux/linux_sysent.c
index df75c3513d5..b71eba049da 100644
--- a/sys/compat/linux/linux_sysent.c
+++ b/sys/compat/linux/linux_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: linux_sysent.c,v 1.76 2013/08/13 05:54:11 guenther Exp $	*/
+/*	$OpenBSD: linux_sysent.c,v 1.77 2013/10/25 04:52:16 guenther Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.72 2013/08/13 05:52:22 guenther Exp 
+ * created from	OpenBSD: syscalls.master,v 1.73 2013/10/25 04:51:39 guenther Exp 
  */
 
 #include <sys/param.h>
@@ -185,10 +185,10 @@ struct sysent linux_sysent[] = {
 	    linux_sys_setrlimit },		/* 75 = setrlimit */
 	{ 2, s(struct linux_sys_getrlimit_args), 0,
 	    linux_sys_getrlimit },		/* 76 = getrlimit */
-	{ 2, s(struct sys_getrusage_args), 0,
-	    sys_getrusage },			/* 77 = getrusage */
-	{ 2, s(struct t32_sys_gettimeofday_args), 0,
-	    t32_sys_gettimeofday },		/* 78 = gettimeofday */
+	{ 2, s(struct linux_sys_getrusage_args), 0,
+	    linux_sys_getrusage },		/* 77 = getrusage */
+	{ 2, s(struct linux_sys_gettimeofday_args), 0,
+	    linux_sys_gettimeofday },		/* 78 = gettimeofday */
 	{ 2, s(struct sys_settimeofday_args), 0,
 	    sys_settimeofday },			/* 79 = settimeofday */
 	{ 2, s(struct sys_getgroups_args), 0,
@@ -244,10 +244,10 @@ struct sysent linux_sysent[] = {
 	    linux_sys_socketcall },		/* 102 = socketcall */
 	{ 0, 0, 0,
 	    linux_sys_klog },			/* 103 = klog */
-	{ 3, s(struct sys_setitimer_args), 0,
-	    sys_setitimer },			/* 104 = setitimer */
-	{ 2, s(struct sys_getitimer_args), 0,
-	    sys_getitimer },			/* 105 = getitimer */
+	{ 3, s(struct linux_sys_setitimer_args), 0,
+	    linux_sys_setitimer },		/* 104 = setitimer */
+	{ 2, s(struct linux_sys_getitimer_args), 0,
+	    linux_sys_getitimer },		/* 105 = getitimer */
 	{ 2, s(struct linux_sys_stat_args), 0,
 	    linux_sys_stat },			/* 106 = stat */
 	{ 2, s(struct linux_sys_lstat_args), 0,
@@ -370,8 +370,8 @@ struct sysent linux_sysent[] = {
 	    linux_sys_sched_get_priority_min },	/* 160 = sched_get_priority_min */
 	{ 0, 0, 0,
 	    linux_sys_sched_rr_get_interval },	/* 161 = sched_rr_get_interval */
-	{ 2, s(struct t32_sys_nanosleep_args), 0,
-	    t32_sys_nanosleep },		/* 162 = nanosleep */
+	{ 2, s(struct linux_sys_nanosleep_args), 0,
+	    linux_sys_nanosleep },		/* 162 = nanosleep */
 	{ 4, s(struct linux_sys_mremap_args), 0,
 	    linux_sys_mremap },			/* 163 = mremap */
 	{ 3, s(struct linux_sys_setresuid16_args), 0,