From 0208af27eee4bac4caf92629940190c53b470c98 Mon Sep 17 00:00:00 2001 From: rafal Date: Mon, 18 Feb 2002 00:10:26 +0000 Subject: [PATCH] Regen: Use linux_sys_{g,s}setrlimit, remove linux_sys_ugetrlimit since linux/mips doesn't seem to have one. --- sys/compat/linux/arch/mips/linux_syscall.h | 7 ++----- .../linux/arch/mips/linux_syscallargs.h | 19 ++++++++++++++----- sys/compat/linux/arch/mips/linux_syscalls.c | 8 ++++---- sys/compat/linux/arch/mips/linux_sysent.c | 18 +++++++++--------- 4 files changed, 29 insertions(+), 23 deletions(-) diff --git a/sys/compat/linux/arch/mips/linux_syscall.h b/sys/compat/linux/arch/mips/linux_syscall.h index deb5207cda9d..10c25d16784b 100644 --- a/sys/compat/linux/arch/mips/linux_syscall.h +++ b/sys/compat/linux/arch/mips/linux_syscall.h @@ -1,10 +1,10 @@ -/* $NetBSD: linux_syscall.h,v 1.8 2002/02/15 16:50:35 christos Exp $ */ +/* $NetBSD: linux_syscall.h,v 1.9 2002/02/18 00:10:26 rafal Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.6 2002/02/15 16:50:13 christos Exp + * created from NetBSD: syscalls.master,v 1.7 2002/02/17 23:55:23 rafal Exp */ /* syscall: "syscall" ret: "int" args: */ @@ -506,9 +506,6 @@ /* syscall: "sigaltstack" ret: "int" args: "const struct linux_sigaltstack *" "struct linux_sigaltstack *" */ #define LINUX_SYS_sigaltstack 206 -/* syscall: "ugetrlimit" ret: "int" args: "int" "struct rlimit *" */ -#define LINUX_SYS_ugetrlimit 209 - /* syscall: "mmap2" ret: "off_t" args: "void *" "size_t" "int" "int" "int" "off_t" */ #define LINUX_SYS_mmap2 210 diff --git a/sys/compat/linux/arch/mips/linux_syscallargs.h b/sys/compat/linux/arch/mips/linux_syscallargs.h index f9ffbe899694..884617c6798c 100644 --- a/sys/compat/linux/arch/mips/linux_syscallargs.h +++ b/sys/compat/linux/arch/mips/linux_syscallargs.h @@ -1,10 +1,10 @@ -/* $NetBSD: linux_syscallargs.h,v 1.8 2002/02/15 16:50:35 christos Exp $ */ +/* $NetBSD: linux_syscallargs.h,v 1.9 2002/02/18 00:10:26 rafal Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.6 2002/02/15 16:50:13 christos Exp + * created from NetBSD: syscalls.master,v 1.7 2002/02/17 23:55:23 rafal Exp */ #ifndef _LINUX_SYS__SYSCALLARGS_H_ @@ -185,6 +185,16 @@ struct linux_sys_sigpending_args { syscallarg(linux_old_sigset_t *) set; }; +struct linux_sys_setrlimit_args { + syscallarg(u_int) which; + syscallarg(struct orlimit *) rlp; +}; + +struct linux_sys_getrlimit_args { + syscallarg(u_int) which; + syscallarg(struct orlimit *) rlp; +}; + struct linux_sys_gettimeofday_args { syscallarg(struct timeval *) tp; syscallarg(struct timezone *) tzp; @@ -594,8 +604,8 @@ int sys_setregid(struct proc *, void *, register_t *); int linux_sys_sigsuspend(struct proc *, void *, register_t *); int linux_sys_sigpending(struct proc *, void *, register_t *); int compat_43_sys_sethostname(struct proc *, void *, register_t *); -int compat_43_sys_setrlimit(struct proc *, void *, register_t *); -int compat_43_sys_getrlimit(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 linux_sys_gettimeofday(struct proc *, void *, register_t *); int linux_sys_settimeofday(struct proc *, void *, register_t *); @@ -698,7 +708,6 @@ int linux_sys_pwrite(struct proc *, void *, register_t *); int linux_sys_chown(struct proc *, void *, register_t *); int sys___getcwd(struct proc *, void *, register_t *); int linux_sys_sigaltstack(struct proc *, void *, register_t *); -int linux_sys_ugetrlimit(struct proc *, void *, register_t *); int linux_sys_mmap2(struct proc *, void *, register_t *); int linux_sys_truncate64(struct proc *, void *, register_t *); int linux_sys_stat64(struct proc *, void *, register_t *); diff --git a/sys/compat/linux/arch/mips/linux_syscalls.c b/sys/compat/linux/arch/mips/linux_syscalls.c index a02fa7f50966..1b3c62bc1798 100644 --- a/sys/compat/linux/arch/mips/linux_syscalls.c +++ b/sys/compat/linux/arch/mips/linux_syscalls.c @@ -1,14 +1,14 @@ -/* $NetBSD: linux_syscalls.c,v 1.8 2002/02/15 16:50:35 christos Exp $ */ +/* $NetBSD: linux_syscalls.c,v 1.9 2002/02/18 00:10:27 rafal Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.6 2002/02/15 16:50:13 christos Exp + * created from NetBSD: syscalls.master,v 1.7 2002/02/17 23:55:23 rafal Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.8 2002/02/15 16:50:35 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.9 2002/02/18 00:10:27 rafal Exp $"); #if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT) @@ -240,7 +240,7 @@ const char *const linux_syscallnames[] = { "sigaltstack", /* 206 = sigaltstack */ "#207 (unimplemented sendfile)", /* 207 = unimplemented sendfile */ "#208 (unimplemented)", /* 208 = unimplemented */ - "ugetrlimit", /* 209 = ugetrlimit */ + "#209 (unimplemented)", /* 209 = unimplemented */ "mmap2", /* 210 = mmap2 */ "truncate64", /* 211 = truncate64 */ "#212 (unimplemented ftruncate64)", /* 212 = unimplemented ftruncate64 */ diff --git a/sys/compat/linux/arch/mips/linux_sysent.c b/sys/compat/linux/arch/mips/linux_sysent.c index c6a23131357b..329e7c08780f 100644 --- a/sys/compat/linux/arch/mips/linux_sysent.c +++ b/sys/compat/linux/arch/mips/linux_sysent.c @@ -1,14 +1,14 @@ -/* $NetBSD: linux_sysent.c,v 1.7 2002/02/15 16:50:36 christos Exp $ */ +/* $NetBSD: linux_sysent.c,v 1.8 2002/02/18 00:10:27 rafal Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.6 2002/02/15 16:50:13 christos Exp + * created from NetBSD: syscalls.master,v 1.7 2002/02/17 23:55:23 rafal Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.7 2002/02/15 16:50:36 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.8 2002/02/18 00:10:27 rafal Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -181,10 +181,10 @@ struct sysent linux_sysent[] = { linux_sys_sigpending }, /* 73 = sigpending */ { 2, s(struct compat_43_sys_sethostname_args), 0, compat_43_sys_sethostname }, /* 74 = sethostname */ - { 2, s(struct compat_43_sys_setrlimit_args), 0, - compat_43_sys_setrlimit }, /* 75 = setrlimit */ - { 2, s(struct compat_43_sys_getrlimit_args), 0, - compat_43_sys_getrlimit }, /* 76 = getrlimit */ + { 2, s(struct linux_sys_setrlimit_args), 0, + 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 linux_sys_gettimeofday_args), 0, @@ -449,8 +449,8 @@ struct sysent linux_sysent[] = { sys_nosys }, /* 207 = unimplemented sendfile */ { 0, 0, 0, sys_nosys }, /* 208 = unimplemented */ - { 2, s(struct linux_sys_ugetrlimit_args), 0, - linux_sys_ugetrlimit }, /* 209 = ugetrlimit */ + { 0, 0, 0, + sys_nosys }, /* 209 = unimplemented */ { 6, s(struct linux_sys_mmap2_args), 0, linux_sys_mmap2 }, /* 210 = mmap2 */ { 2, s(struct linux_sys_truncate64_args), 0,