Regenerate after the futex commit.

4 files changed, 45 insertions, 13 deletions

diff --git a/sys/compat/linux/linux_syscall.h b/sys/compat/linux/linux_syscall.h
index 806dc60ef4f..6363004b13b 100644
--- a/sys/compat/linux/linux_syscall.h
+++ b/sys/compat/linux/linux_syscall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_syscall.h,v 1.64 2011/07/14 23:33:09 matthew Exp $	*/
+/*	$OpenBSD: linux_syscall.h,v 1.65 2011/09/18 02:26:28 pirofti Exp $	*/
 
 /*
  * System call numbers.
@@ -718,6 +718,9 @@
 /* syscall: "fremovexattr" ret: "int" args: */
 #define	LINUX_SYS_fremovexattr	237
 
+/* syscall: "futex" ret: "int" args: "int *" "int" "int" "const struct linux_timespec *" "int *" "int" */
+#define	LINUX_SYS_futex	240
+
 /* syscall: "set_thread_area" ret: "int" args: "struct l_segment_descriptor *" */
 #define	LINUX_SYS_set_thread_area	243
 
@@ -739,4 +742,10 @@
 /* syscall: "clock_getres" ret: "int" args: "clockid_t" "struct l_timespec *" */
 #define	LINUX_SYS_clock_getres	266
 
+/* syscall: "set_robust_list" ret: "int" args: "struct linux_robust_list_head *" "size_t" */
+#define	LINUX_SYS_set_robust_list	311
+
+/* syscall: "get_robust_list" ret: "int" args: "int" "struct linux_robust_list_head **" "size_t *" */
+#define	LINUX_SYS_get_robust_list	312
+
 #define	LINUX_SYS_MAXSYSCALL	313
diff --git a/sys/compat/linux/linux_syscallargs.h b/sys/compat/linux/linux_syscallargs.h
index 644a6877460..4fc7d976b76 100644
--- a/sys/compat/linux/linux_syscallargs.h
+++ b/sys/compat/linux/linux_syscallargs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_syscallargs.h,v 1.66 2011/07/14 23:33:09 matthew Exp $	*/
+/*	$OpenBSD: linux_syscallargs.h,v 1.67 2011/09/18 02:26:28 pirofti Exp $	*/
 
 /*
  * System call argument lists.
@@ -568,6 +568,15 @@ struct linux_sys_fcntl64_args {
 	syscallarg(void *) arg;
 };
 
+struct linux_sys_futex_args {
+	syscallarg(int *) uaddr;
+	syscallarg(int) op;
+	syscallarg(int) val;
+	syscallarg(const struct linux_timespec *) timeout;
+	syscallarg(int *) uaddr2;
+	syscallarg(int) val3;
+};
+
 struct linux_sys_set_thread_area_args {
 	syscallarg(struct l_segment_descriptor *) desc;
 };
@@ -590,6 +599,17 @@ struct linux_sys_clock_getres_args {
 	syscallarg(struct l_timespec *) tp;
 };
 
+struct linux_sys_set_robust_list_args {
+	syscallarg(struct linux_robust_list_head *) head;
+	syscallarg(size_t) len;
+};
+
+struct linux_sys_get_robust_list_args {
+	syscallarg(int) pid;
+	syscallarg(struct linux_robust_list_head **) head;
+	syscallarg(size_t *) len;
+};
+
 /*
  * System call prototypes.
  */
@@ -846,6 +866,7 @@ int	linux_sys_flistxattr(struct proc *, void *, register_t *);
 int	linux_sys_removexattr(struct proc *, void *, register_t *);
 int	linux_sys_lremovexattr(struct proc *, void *, register_t *);
 int	linux_sys_fremovexattr(struct proc *, void *, register_t *);
+int	linux_sys_futex(struct proc *, void *, register_t *);
 int	linux_sys_set_thread_area(struct proc *, void *, register_t *);
 int	linux_sys_get_thread_area(struct proc *, void *, register_t *);
 int	linux_sys_fadvise64(struct proc *, void *, register_t *);
@@ -853,3 +874,5 @@ int	sys_exit(struct proc *, void *, register_t *);
 int	linux_sys_set_tid_address(struct proc *, void *, register_t *);
 int	linux_sys_clock_gettime(struct proc *, void *, register_t *);
 int	linux_sys_clock_getres(struct proc *, void *, register_t *);
+int	linux_sys_set_robust_list(struct proc *, void *, register_t *);
+int	linux_sys_get_robust_list(struct proc *, void *, register_t *);
diff --git a/sys/compat/linux/linux_syscalls.c b/sys/compat/linux/linux_syscalls.c
index d9e4d22536e..2596032871f 100644
--- a/sys/compat/linux/linux_syscalls.c
+++ b/sys/compat/linux/linux_syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_syscalls.c,v 1.64 2011/07/14 23:33:09 matthew Exp $	*/
+/*	$OpenBSD: linux_syscalls.c,v 1.65 2011/09/18 02:26:28 pirofti Exp $	*/
 
 /*
  * System call names.
@@ -268,7 +268,7 @@ char *linux_syscallnames[] = {
 	"fremovexattr",			/* 237 = fremovexattr */
 	"#238 (unimplemented linux_sys_tkill)",		/* 238 = unimplemented linux_sys_tkill */
 	"#239 (unimplemented linux_sys_sendfile64)",		/* 239 = unimplemented linux_sys_sendfile64 */
-	"#240 (unimplemented linux_sys_futex)",		/* 240 = unimplemented linux_sys_futex */
+	"futex",			/* 240 = futex */
 	"#241 (unimplemented linux_sys_sched_setaffinity)",		/* 241 = unimplemented linux_sys_sched_setaffinity */
 	"#242 (unimplemented linux_sys_sched_getaffinity)",		/* 242 = unimplemented linux_sys_sched_getaffinity */
 	"set_thread_area",			/* 243 = set_thread_area */
@@ -339,6 +339,6 @@ char *linux_syscallnames[] = {
 	"#308 (unimplemented linux_sys_pselect6)",		/* 308 = unimplemented linux_sys_pselect6 */
 	"#309 (unimplemented linux_sys_ppoll)",		/* 309 = unimplemented linux_sys_ppoll */
 	"#310 (unimplemented linux_sys_unshare)",		/* 310 = unimplemented linux_sys_unshare */
-	"#311 (unimplemented linux_sys_set_robust_list)",		/* 311 = unimplemented linux_sys_set_robust_list */
-	"#312 (unimplemented linux_sys_get_robust_list)",		/* 312 = unimplemented linux_sys_get_robust_list */
+	"set_robust_list",			/* 311 = set_robust_list */
+	"get_robust_list",			/* 312 = get_robust_list */
 };
diff --git a/sys/compat/linux/linux_sysent.c b/sys/compat/linux/linux_sysent.c
index fa0e8bf047f..57727062072 100644
--- a/sys/compat/linux/linux_sysent.c
+++ b/sys/compat/linux/linux_sysent.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_sysent.c,v 1.65 2011/07/14 23:33:09 matthew Exp $	*/
+/*	$OpenBSD: linux_sysent.c,v 1.66 2011/09/18 02:26:28 pirofti Exp $	*/
 
 /*
  * System call switch table.
@@ -526,8 +526,8 @@ struct sysent linux_sysent[] = {
 	    sys_nosys },			/* 238 = unimplemented linux_sys_tkill */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 239 = unimplemented linux_sys_sendfile64 */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 240 = unimplemented linux_sys_futex */
+	{ 6, s(struct linux_sys_futex_args), 0,
+	    linux_sys_futex },			/* 240 = futex */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 241 = unimplemented linux_sys_sched_setaffinity */
 	{ 0, 0, 0,
@@ -668,9 +668,9 @@ struct sysent linux_sysent[] = {
 	    sys_nosys },			/* 309 = unimplemented linux_sys_ppoll */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 310 = unimplemented linux_sys_unshare */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 311 = unimplemented linux_sys_set_robust_list */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 312 = unimplemented linux_sys_get_robust_list */
+	{ 2, s(struct linux_sys_set_robust_list_args), 0,
+	    linux_sys_set_robust_list },	/* 311 = set_robust_list */
+	{ 3, s(struct linux_sys_get_robust_list_args), 0,
+	    linux_sys_get_robust_list },	/* 312 = get_robust_list */
 };