sync

4 files changed, 35 insertions, 13 deletions

diff --git a/sys/compat/linux/linux_syscall.h b/sys/compat/linux/linux_syscall.h
index bcaea04b8f3..15c4d9ea315 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.21 2000/04/12 04:23:05 jasoni Exp $	*/
+/*	$OpenBSD: linux_syscall.h,v 1.22 2000/06/07 13:37:55 niklas Exp $	*/
 
 /*
  * System call numbers.
@@ -198,10 +198,10 @@
 /* syscall: "sethostname" ret: "int" args: "char *" "u_int" */
 #define	LINUX_SYS_sethostname	74
 
-/* syscall: "setrlimit" ret: "int" args: "u_int" "struct ogetrlimit *" */
+/* syscall: "setrlimit" ret: "int" args: "u_int" "struct linux_rlimit *" */
 #define	LINUX_SYS_setrlimit	75
 
-/* syscall: "getrlimit" ret: "int" args: "u_int" "struct ogetrlimit *" */
+/* syscall: "getrlimit" ret: "int" args: "u_int" "struct linux_rlimit *" */
 #define	LINUX_SYS_getrlimit	76
 
 /* syscall: "getrusage" ret: "int" args: "int" "struct rusage *" */
@@ -432,4 +432,7 @@
 /* syscall: "vfork" ret: "int" args: */
 #define	LINUX_SYS_vfork	190
 
-#define	LINUX_SYS_MAXSYSCALL	191
+/* syscall: "ugetrlimit" ret: "int" args: "u_int" "struct linux_rlimit *" */
+#define	LINUX_SYS_ugetrlimit	191
+
+#define	LINUX_SYS_MAXSYSCALL	192
diff --git a/sys/compat/linux/linux_syscallargs.h b/sys/compat/linux/linux_syscallargs.h
index cd4bbd15b10..14cd13941ae 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.22 2000/04/12 04:23:05 jasoni Exp $	*/
+/*	$OpenBSD: linux_syscallargs.h,v 1.23 2000/06/07 13:37:56 niklas Exp $	*/
 
 /*
  * System call argument lists.
@@ -181,6 +181,16 @@ struct linux_sys_sigpending_args {
 	syscallarg(linux_old_sigset_t *) mask;
 };
 
+struct linux_sys_setrlimit_args {
+	syscallarg(u_int) which;
+	syscallarg(struct linux_rlimit *) rlp;
+};
+
+struct linux_sys_getrlimit_args {
+	syscallarg(u_int) which;
+	syscallarg(struct linux_rlimit *) rlp;
+};
+
 struct linux_sys_oldselect_args {
 	syscallarg(struct linux_select *) lsp;
 };
@@ -430,6 +440,11 @@ struct linux_sys_getcwd_args {
 	syscallarg(size_t) length;
 };
 
+struct linux_sys_ugetrlimit_args {
+	syscallarg(u_int) which;
+	syscallarg(struct linux_rlimit *) rlp;
+};
+
 /*
  * System call prototypes.
  */
@@ -497,8 +512,8 @@ int	linux_sys_setregid	__P((struct proc *, void *, register_t *));
 int	linux_sys_sigsuspend	__P((struct proc *, void *, register_t *));
 int	linux_sys_sigpending	__P((struct proc *, void *, register_t *));
 int	compat_43_sys_sethostname	__P((struct proc *, void *, register_t *));
-int	compat_43_sys_setrlimit	__P((struct proc *, void *, register_t *));
-int	compat_43_sys_getrlimit	__P((struct proc *, void *, register_t *));
+int	linux_sys_setrlimit	__P((struct proc *, void *, register_t *));
+int	linux_sys_getrlimit	__P((struct proc *, void *, register_t *));
 int	sys_getrusage	__P((struct proc *, void *, register_t *));
 int	sys_gettimeofday	__P((struct proc *, void *, register_t *));
 int	sys_settimeofday	__P((struct proc *, void *, register_t *));
@@ -584,3 +599,4 @@ int	linux_sys_pwrite	__P((struct proc *, void *, register_t *));
 int	linux_sys_chown	__P((struct proc *, void *, register_t *));
 int	linux_sys_getcwd	__P((struct proc *, void *, register_t *));
 int	sys_vfork	__P((struct proc *, void *, register_t *));
+int	linux_sys_ugetrlimit	__P((struct proc *, void *, register_t *));
diff --git a/sys/compat/linux/linux_syscalls.c b/sys/compat/linux/linux_syscalls.c
index 9c6e889f335..0e6f561bc8c 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.21 2000/04/12 04:23:05 jasoni Exp $	*/
+/*	$OpenBSD: linux_syscalls.c,v 1.22 2000/06/07 13:37:56 niklas Exp $	*/
 
 /*
  * System call names.
@@ -211,4 +211,5 @@ char *linux_syscallnames[] = {
 	"#188 (unimplemented getpmsg)",		/* 188 = unimplemented getpmsg */
 	"#189 (unimplemented putpmsg)",		/* 189 = unimplemented putpmsg */
 	"vfork",			/* 190 = vfork */
+	"ugetrlimit",			/* 191 = ugetrlimit */
 };
diff --git a/sys/compat/linux/linux_sysent.c b/sys/compat/linux/linux_sysent.c
index 23573f34fc9..8da6980cb1d 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.22 2000/04/12 04:23:05 jasoni Exp $	*/
+/*	$OpenBSD: linux_sysent.c,v 1.23 2000/06/07 13:37:56 niklas Exp $	*/
 
 /*
  * System call switch table.
@@ -170,10 +170,10 @@ struct sysent linux_sysent[] = {
 	    linux_sys_sigpending },		/* 73 = sigpending */
 	{ 2, s(struct compat_43_sys_sethostname_args),
 	    compat_43_sys_sethostname },	/* 74 = sethostname */
-	{ 2, s(struct compat_43_sys_setrlimit_args),
-	    compat_43_sys_setrlimit },		/* 75 = setrlimit */
-	{ 2, s(struct compat_43_sys_getrlimit_args),
-	    compat_43_sys_getrlimit },		/* 76 = getrlimit */
+	{ 2, s(struct linux_sys_setrlimit_args),
+	    linux_sys_setrlimit },		/* 75 = setrlimit */
+	{ 2, s(struct linux_sys_getrlimit_args),
+	    linux_sys_getrlimit },		/* 76 = getrlimit */
 	{ 2, s(struct sys_getrusage_args),
 	    sys_getrusage },			/* 77 = getrusage */
 	{ 2, s(struct sys_gettimeofday_args),
@@ -417,5 +417,7 @@ struct sysent linux_sysent[] = {
 	    sys_nosys },			/* 189 = unimplemented putpmsg */
 	{ 0, 0,
 	    sys_vfork },			/* 190 = vfork */
+	{ 2, s(struct linux_sys_ugetrlimit_args),
+	    linux_sys_ugetrlimit },		/* 191 = ugetrlimit */
 };