diff options
| author | dsl <dsl@NetBSD.org> | 2007-12-08 18:35:53 +0000 |
|---|---|---|
| committer | dsl <dsl@NetBSD.org> | 2007-12-08 18:35:53 +0000 |
| commit | 28bae79b2713013fa5c98bdd7a8bdde85ccc3ffd (patch) | |
| tree | e96dcadb2e523d907f659aa130436e909e7bfd97 /sys/compat/linux/common | |
| parent | c26a54ba243a5ba3a847aeba86fe44f2e4a86203 (diff) | |
ANSIfy most of the function definitions in sys/compat (but not ndis).
All by the magic of sed ...
Diffstat (limited to 'sys/compat/linux/common')
| -rw-r--r-- | sys/compat/linux/common/linux_exec.c | 14 | ||||
| -rw-r--r-- | sys/compat/linux/common/linux_exec_aout.c | 24 | ||||
| -rw-r--r-- | sys/compat/linux/common/linux_file.c | 93 | ||||
| -rw-r--r-- | sys/compat/linux/common/linux_file64.c | 57 | ||||
| -rw-r--r-- | sys/compat/linux/common/linux_ioctl.c | 9 | ||||
| -rw-r--r-- | sys/compat/linux/common/linux_ipc.c | 77 | ||||
| -rw-r--r-- | sys/compat/linux/common/linux_ipccall.c | 9 | ||||
| -rw-r--r-- | sys/compat/linux/common/linux_llseek.c | 9 | ||||
| -rw-r--r-- | sys/compat/linux/common/linux_misc.c | 149 | ||||
| -rw-r--r-- | sys/compat/linux/common/linux_misc_notalpha.c | 43 | ||||
| -rw-r--r-- | sys/compat/linux/common/linux_oldmmap.c | 9 | ||||
| -rw-r--r-- | sys/compat/linux/common/linux_oldselect.c | 9 | ||||
| -rw-r--r-- | sys/compat/linux/common/linux_pipe.c | 9 | ||||
| -rw-r--r-- | sys/compat/linux/common/linux_sched.c | 49 | ||||
| -rw-r--r-- | sys/compat/linux/common/linux_sig_notalpha.c | 14 | ||||
| -rw-r--r-- | sys/compat/linux/common/linux_signal.c | 78 | ||||
| -rw-r--r-- | sys/compat/linux/common/linux_socket.c | 109 | ||||
| -rw-r--r-- | sys/compat/linux/common/linux_socketcall.c | 9 | ||||
| -rw-r--r-- | sys/compat/linux/common/linux_time.c | 34 |
19 files changed, 196 insertions, 608 deletions
diff --git a/sys/compat/linux/common/linux_exec.c b/sys/compat/linux/common/linux_exec.c index d87da2bad52..417ce37b330 100644 --- a/sys/compat/linux/common/linux_exec.c +++ b/sys/compat/linux/common/linux_exec.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_exec.c,v 1.99 2007/12/04 18:40:15 dsl Exp $ */ +/* $NetBSD: linux_exec.c,v 1.100 2007/12/08 18:36:06 dsl Exp $ */ /*- * Copyright (c) 1994, 1995, 1998, 2000, 2007 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_exec.c,v 1.99 2007/12/04 18:40:15 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_exec.c,v 1.100 2007/12/08 18:36:06 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -238,8 +238,7 @@ linux_e_proc_exec(struct proc *p, struct exec_package *epp) * Emulation per-process exit hook. */ static void -linux_e_proc_exit(p) - struct proc *p; +linux_e_proc_exit(struct proc *p) { struct linux_emuldata *e = p->p_emuldata; @@ -309,8 +308,7 @@ linux_userret(void) } void -linux_nptl_proc_exit(p) - struct proc *p; +linux_nptl_proc_exit(struct proc *p) { struct linux_emuldata *e = p->p_emuldata; @@ -407,9 +405,7 @@ linux_nptl_proc_fork(p, parent, luserret) } void -linux_nptl_proc_init(p, parent) - struct proc *p; - struct proc *parent; +linux_nptl_proc_init(struct proc *p, struct proc *parent) { struct linux_emuldata *e = p->p_emuldata; struct linux_emuldata *ep; diff --git a/sys/compat/linux/common/linux_exec_aout.c b/sys/compat/linux/common/linux_exec_aout.c index 32e4602a846..d89a2c650ca 100644 --- a/sys/compat/linux/common/linux_exec_aout.c +++ b/sys/compat/linux/common/linux_exec_aout.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_exec_aout.c,v 1.63 2007/12/04 18:40:15 dsl Exp $ */ +/* $NetBSD: linux_exec_aout.c,v 1.64 2007/12/08 18:36:07 dsl Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_exec_aout.c,v 1.63 2007/12/04 18:40:15 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_exec_aout.c,v 1.64 2007/12/08 18:36:07 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -134,9 +134,7 @@ linux_aout_copyargs(struct lwp *l, struct exec_package *pack, } int -exec_linux_aout_makecmds(l, epp) - struct lwp *l; - struct exec_package *epp; +exec_linux_aout_makecmds(struct lwp *l, struct exec_package *epp) { struct exec *linux_ep = epp->ep_hdr; int machtype, magic; @@ -173,9 +171,7 @@ exec_linux_aout_makecmds(l, epp) */ static int -exec_linux_aout_prep_zmagic(l, epp) - struct lwp *l; - struct exec_package *epp; +exec_linux_aout_prep_zmagic(struct lwp *l, struct exec_package *epp) { struct exec *execp = epp->ep_hdr; @@ -210,9 +206,7 @@ exec_linux_aout_prep_zmagic(l, epp) */ static int -exec_linux_aout_prep_nmagic(l, epp) - struct lwp *l; - struct exec_package *epp; +exec_linux_aout_prep_nmagic(struct lwp *l, struct exec_package *epp) { struct exec *execp = epp->ep_hdr; long bsize, baddr; @@ -249,9 +243,7 @@ exec_linux_aout_prep_nmagic(l, epp) */ static int -exec_linux_aout_prep_omagic(l, epp) - struct lwp *l; - struct exec_package *epp; +exec_linux_aout_prep_omagic(struct lwp *l, struct exec_package *epp) { struct exec *execp = epp->ep_hdr; long dsize, bsize, baddr; @@ -289,9 +281,7 @@ exec_linux_aout_prep_omagic(l, epp) } static int -exec_linux_aout_prep_qmagic(l, epp) - struct lwp *l; - struct exec_package *epp; +exec_linux_aout_prep_qmagic(struct lwp *l, struct exec_package *epp) { struct exec *execp = epp->ep_hdr; int error; diff --git a/sys/compat/linux/common/linux_file.c b/sys/compat/linux/common/linux_file.c index 481288bf2ff..dc4942099ac 100644 --- a/sys/compat/linux/common/linux_file.c +++ b/sys/compat/linux/common/linux_file.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_file.c,v 1.87 2007/12/04 18:40:15 dsl Exp $ */ +/* $NetBSD: linux_file.c,v 1.88 2007/12/08 18:36:07 dsl Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_file.c,v 1.87 2007/12/04 18:40:15 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_file.c,v 1.88 2007/12/08 18:36:07 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -94,8 +94,7 @@ static int linux_stat1(struct lwp *, void *, register_t *, int); * of the flags used in open(2) and fcntl(2). */ static int -linux_to_bsd_ioflags(lflags) - int lflags; +linux_to_bsd_ioflags(int lflags) { int res = 0; @@ -115,8 +114,7 @@ linux_to_bsd_ioflags(lflags) } static int -bsd_to_linux_ioflags(bflags) - int bflags; +bsd_to_linux_ioflags(int bflags) { int res = 0; @@ -145,10 +143,7 @@ bsd_to_linux_ioflags(bflags) * Just call open(2) with the TRUNC, CREAT and WRONLY flags. */ int -linux_sys_creat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_creat(struct lwp *l, void *v, register_t *retval) { struct linux_sys_creat_args /* { syscallarg(const char *) path; @@ -170,10 +165,7 @@ linux_sys_creat(l, v, retval) * (XXX is this necessary?) */ int -linux_sys_open(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_open(struct lwp *l, void *v, register_t *retval) { struct linux_sys_open_args /* { syscallarg(const char *) path; @@ -225,9 +217,7 @@ linux_sys_open(l, v, retval) * the fields, and the 'whence' value. */ static void -bsd_to_linux_flock(bfp, lfp) - struct flock *bfp; - struct linux_flock *lfp; +bsd_to_linux_flock(struct flock *bfp, struct linux_flock *lfp) { lfp->l_start = bfp->l_start; @@ -248,9 +238,7 @@ bsd_to_linux_flock(bfp, lfp) } static void -linux_to_bsd_flock(lfp, bfp) - struct linux_flock *lfp; - struct flock *bfp; +linux_to_bsd_flock(struct linux_flock *lfp, struct flock *bfp) { bfp->l_start = lfp->l_start; @@ -277,10 +265,7 @@ linux_to_bsd_flock(lfp, bfp) * because the flag values and lock structure are different. */ int -linux_sys_fcntl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_fcntl(struct lwp *l, void *v, register_t *retval) { struct linux_sys_fcntl_args /* { syscallarg(int) fd; @@ -478,9 +463,7 @@ linux_sys_fcntl(l, v, retval) * things against constant major device numbers? sigh) */ static void -bsd_to_linux_stat(bsp, lsp) - struct stat *bsp; - struct linux_stat *lsp; +bsd_to_linux_stat(struct stat *bsp, struct linux_stat *lsp) { lsp->lst_dev = linux_fakedev(bsp->st_dev, 0); @@ -511,10 +494,7 @@ bsd_to_linux_stat(bsp, lsp) * by one function to avoid code duplication. */ int -linux_sys_fstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_fstat(struct lwp *l, void *v, register_t *retval) { struct linux_sys_fstat_args /* { syscallarg(int) fd; @@ -533,11 +513,7 @@ linux_sys_fstat(l, v, retval) } static int -linux_stat1(l, v, retval, flags) - struct lwp *l; - void *v; - register_t *retval; - int flags; +linux_stat1(struct lwp *l, void *v, register_t *retval, int flags) { struct linux_stat tmplst; struct stat tmpst; @@ -554,10 +530,7 @@ linux_stat1(l, v, retval, flags) } int -linux_sys_stat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_stat(struct lwp *l, void *v, register_t *retval) { struct linux_sys_stat_args /* { syscallarg(const char *) path; @@ -570,10 +543,7 @@ linux_sys_stat(l, v, retval) /* Note: this is "newlstat" in the Linux sources */ /* (we don't bother with the old lstat currently) */ int -linux_sys_lstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_lstat(struct lwp *l, void *v, register_t *retval) { struct linux_sys_lstat_args /* { syscallarg(const char *) path; @@ -626,10 +596,7 @@ linux_sys_unlink(l, v, retval) } int -linux_sys_mknod(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_mknod(struct lwp *l, void *v, register_t *retval) { struct linux_sys_mknod_args /* { syscallarg(const char *) path; @@ -665,10 +632,7 @@ linux_sys_mknod(l, v, retval) #if defined(__i386__) || defined(__m68k__) || \ defined(__arm__) int -linux_sys_chown16(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_chown16(struct lwp *l, void *v, register_t *retval) { struct linux_sys_chown16_args /* { syscallarg(const char *) path; @@ -687,10 +651,7 @@ linux_sys_chown16(l, v, retval) } int -linux_sys_fchown16(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_fchown16(struct lwp *l, void *v, register_t *retval) { struct linux_sys_fchown16_args /* { syscallarg(int) fd; @@ -709,10 +670,7 @@ linux_sys_fchown16(l, v, retval) } int -linux_sys_lchown16(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_lchown16(struct lwp *l, void *v, register_t *retval) { struct linux_sys_lchown16_args /* { syscallarg(char *) path; @@ -738,10 +696,7 @@ linux_sys_lchown16(l, v, retval) * (syscall #148 on the arm) */ int -linux_sys_fdatasync(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_fdatasync(struct lwp *l, void *v, register_t *retval) { #ifdef notdef struct linux_sys_fdatasync_args /* { @@ -755,10 +710,7 @@ linux_sys_fdatasync(l, v, retval) * pread(2). */ int -linux_sys_pread(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_pread(struct lwp *l, void *v, register_t *retval) { struct linux_sys_pread_args /* { syscallarg(int) fd; @@ -780,10 +732,7 @@ linux_sys_pread(l, v, retval) * pwrite(2). */ int -linux_sys_pwrite(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_pwrite(struct lwp *l, void *v, register_t *retval) { struct linux_sys_pwrite_args /* { syscallarg(int) fd; diff --git a/sys/compat/linux/common/linux_file64.c b/sys/compat/linux/common/linux_file64.c index 380995fde18..8025e0ddcb2 100644 --- a/sys/compat/linux/common/linux_file64.c +++ b/sys/compat/linux/common/linux_file64.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_file64.c,v 1.42 2007/12/04 18:40:15 dsl Exp $ */ +/* $NetBSD: linux_file64.c,v 1.43 2007/12/08 18:36:07 dsl Exp $ */ /*- * Copyright (c) 1995, 1998, 2000 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_file64.c,v 1.42 2007/12/04 18:40:15 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_file64.c,v 1.43 2007/12/08 18:36:07 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -90,9 +90,7 @@ static int linux_do_stat64(struct lwp *, void *, register_t *, int); * things against constant major device numbers? sigh) */ static void -bsd_to_linux_stat(bsp, lsp) - struct stat *bsp; - struct linux_stat64 *lsp; +bsd_to_linux_stat(struct stat *bsp, struct linux_stat64 *lsp) { lsp->lst_dev = linux_fakedev(bsp->st_dev, 0); lsp->lst_ino = bsp->st_ino; @@ -125,10 +123,7 @@ bsd_to_linux_stat(bsp, lsp) * by one function to avoid code duplication. */ int -linux_sys_fstat64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_fstat64(struct lwp *l, void *v, register_t *retval) { struct linux_sys_fstat64_args /* { syscallarg(int) fd; @@ -148,11 +143,7 @@ linux_sys_fstat64(l, v, retval) } static int -linux_do_stat64(l, v, retval, flags) - struct lwp *l; - void *v; - register_t *retval; - int flags; +linux_do_stat64(struct lwp *l, void *v, register_t *retval, int flags) { struct linux_stat64 tmplst; struct stat tmpst; @@ -169,10 +160,7 @@ linux_do_stat64(l, v, retval, flags) } int -linux_sys_stat64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_stat64(struct lwp *l, void *v, register_t *retval) { struct linux_sys_stat64_args /* { syscallarg(const char *) path; @@ -183,10 +171,7 @@ linux_sys_stat64(l, v, retval) } int -linux_sys_lstat64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_lstat64(struct lwp *l, void *v, register_t *retval) { struct linux_sys_lstat64_args /* { syscallarg(const char *) path; @@ -197,10 +182,7 @@ linux_sys_lstat64(l, v, retval) } int -linux_sys_truncate64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_truncate64(struct lwp *l, void *v, register_t *retval) { struct linux_sys_truncate64_args /* { syscallarg(const char *) path; @@ -217,10 +199,7 @@ linux_sys_truncate64(l, v, retval) } int -linux_sys_ftruncate64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_ftruncate64(struct lwp *l, void *v, register_t *retval) { struct linux_sys_ftruncate64_args /* { syscallarg(unsigned int) fd; @@ -244,9 +223,7 @@ static void linux_to_bsd_flock64(struct flock *, const struct linux_flock64 *); static void -bsd_to_linux_flock64(lfp, bfp) - struct linux_flock64 *lfp; - const struct flock *bfp; +bsd_to_linux_flock64(struct linux_flock64 *lfp, const struct flock *bfp) { lfp->l_start = bfp->l_start; @@ -267,9 +244,7 @@ bsd_to_linux_flock64(lfp, bfp) } static void -linux_to_bsd_flock64(bfp, lfp) - struct flock *bfp; - const struct linux_flock64 *lfp; +linux_to_bsd_flock64(struct flock *bfp, const struct linux_flock64 *lfp) { bfp->l_start = lfp->l_start; @@ -290,10 +265,7 @@ linux_to_bsd_flock64(bfp, lfp) } int -linux_sys_fcntl64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_fcntl64(struct lwp *l, void *v, register_t *retval) { struct linux_sys_fcntl64_args /* { syscallarg(int) fd; @@ -348,10 +320,7 @@ linux_sys_fcntl64(l, v, retval) */ #ifndef COMPAT_LINUX32 int -linux_sys_getdents64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_getdents64(struct lwp *l, void *v, register_t *retval) { struct linux_sys_getdents_args /* { syscallarg(int) fd; diff --git a/sys/compat/linux/common/linux_ioctl.c b/sys/compat/linux/common/linux_ioctl.c index 88f726b78b5..87ba413857e 100644 --- a/sys/compat/linux/common/linux_ioctl.c +++ b/sys/compat/linux/common/linux_ioctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_ioctl.c,v 1.50 2007/11/26 19:01:31 pooka Exp $ */ +/* $NetBSD: linux_ioctl.c,v 1.51 2007/12/08 18:36:07 dsl Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_ioctl.c,v 1.50 2007/11/26 19:01:31 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_ioctl.c,v 1.51 2007/12/08 18:36:07 dsl Exp $"); #if defined(_KERNEL_OPT) #include "sequencer.h" @@ -76,10 +76,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_ioctl.c,v 1.50 2007/11/26 19:01:31 pooka Exp $ * values need some massaging. */ int -linux_sys_ioctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_ioctl(struct lwp *l, void *v, register_t *retval) { struct linux_sys_ioctl_args /* { syscallarg(int) fd; diff --git a/sys/compat/linux/common/linux_ipc.c b/sys/compat/linux/common/linux_ipc.c index 806bd7169d1..5223a5de600 100644 --- a/sys/compat/linux/common/linux_ipc.c +++ b/sys/compat/linux/common/linux_ipc.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_ipc.c,v 1.40 2007/06/17 18:17:46 dsl Exp $ */ +/* $NetBSD: linux_ipc.c,v 1.41 2007/12/08 18:36:07 dsl Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_ipc.c,v 1.40 2007/06/17 18:17:46 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_ipc.c,v 1.41 2007/12/08 18:36:07 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_sysv.h" @@ -94,9 +94,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_ipc.c,v 1.40 2007/06/17 18:17:46 dsl Exp $"); * order of the fields is different. */ void -linux_to_bsd_ipc_perm(lpp, bpp) - struct linux_ipc_perm *lpp; - struct ipc_perm *bpp; +linux_to_bsd_ipc_perm(struct linux_ipc_perm *lpp, struct ipc_perm *bpp) { bpp->_key = lpp->l_key; @@ -109,9 +107,7 @@ linux_to_bsd_ipc_perm(lpp, bpp) } void -linux_to_bsd_ipc64_perm(lpp, bpp) - struct linux_ipc64_perm *lpp; - struct ipc_perm *bpp; +linux_to_bsd_ipc64_perm(struct linux_ipc64_perm *lpp, struct ipc_perm *bpp) { bpp->_key = lpp->l_key; bpp->uid = lpp->l_uid; @@ -123,9 +119,7 @@ linux_to_bsd_ipc64_perm(lpp, bpp) } void -bsd_to_linux_ipc_perm(bpp, lpp) - struct ipc_perm *bpp; - struct linux_ipc_perm *lpp; +bsd_to_linux_ipc_perm(struct ipc_perm *bpp, struct linux_ipc_perm *lpp) { lpp->l_key = bpp->_key; @@ -138,9 +132,7 @@ bsd_to_linux_ipc_perm(bpp, lpp) } void -bsd_to_linux_ipc64_perm(bpp, lpp) - struct ipc_perm *bpp; - struct linux_ipc64_perm *lpp; +bsd_to_linux_ipc64_perm(struct ipc_perm *bpp, struct linux_ipc64_perm *lpp) { lpp->l_key = bpp->_key; lpp->l_uid = bpp->uid; @@ -163,9 +155,7 @@ bsd_to_linux_ipc64_perm(bpp, lpp) * Convert between Linux and NetBSD semid_ds structures. */ void -bsd_to_linux_semid_ds(bs, ls) - struct semid_ds *bs; - struct linux_semid_ds *ls; +bsd_to_linux_semid_ds(struct semid_ds *bs, struct linux_semid_ds *ls) { bsd_to_linux_ipc_perm(&bs->sem_perm, &ls->l_sem_perm); @@ -176,9 +166,7 @@ bsd_to_linux_semid_ds(bs, ls) } void -linux_to_bsd_semid_ds(ls, bs) - struct linux_semid_ds *ls; - struct semid_ds *bs; +linux_to_bsd_semid_ds(struct linux_semid_ds *ls, struct semid_ds *bs) { linux_to_bsd_ipc_perm(&ls->l_sem_perm, &bs->sem_perm); @@ -193,10 +181,7 @@ linux_to_bsd_semid_ds(ls, bs) * just need to frob the `cmd' and convert the semid_ds and semun. */ int -linux_sys_semctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_semctl(struct lwp *l, void *v, register_t *retval) { struct linux_sys_semctl_args /* { syscallarg(int) semid; @@ -289,9 +274,7 @@ linux_sys_semctl(l, v, retval) #ifdef SYSVMSG void -linux_to_bsd_msqid_ds(lmp, bmp) - struct linux_msqid_ds *lmp; - struct msqid_ds *bmp; +linux_to_bsd_msqid_ds(struct linux_msqid_ds *lmp, struct msqid_ds *bmp) { linux_to_bsd_ipc_perm(&lmp->l_msg_perm, &bmp->msg_perm); @@ -308,9 +291,7 @@ linux_to_bsd_msqid_ds(lmp, bmp) } void -bsd_to_linux_msqid_ds(bmp, lmp) - struct msqid_ds *bmp; - struct linux_msqid_ds *lmp; +bsd_to_linux_msqid_ds(struct msqid_ds *bmp, struct linux_msqid_ds *lmp) { bsd_to_linux_ipc_perm(&bmp->msg_perm, &lmp->l_msg_perm); @@ -327,10 +308,7 @@ bsd_to_linux_msqid_ds(bmp, lmp) } int -linux_sys_msgctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_msgctl(struct lwp *l, void *v, register_t *retval) { struct linux_sys_msgctl_args /* { syscallarg(int) msqid; @@ -370,10 +348,7 @@ linux_sys_msgctl(l, v, retval) * the segment would be removed. */ int -linux_sys_shmget(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_shmget(struct lwp *l, void *v, register_t *retval) { struct sys_shmget_args /* { syscallarg(key_t) key; @@ -392,10 +367,7 @@ linux_sys_shmget(l, v, retval) */ #ifndef __amd64__ int -linux_sys_shmat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_shmat(struct lwp *l, void *v, register_t *retval) { struct linux_sys_shmat_args /* { syscallarg(int) shmid; @@ -428,9 +400,7 @@ linux_sys_shmat(l, v, retval) * We abuse a Linux internal field for that. */ void -linux_to_bsd_shmid_ds(lsp, bsp) - struct linux_shmid_ds *lsp; - struct shmid_ds *bsp; +linux_to_bsd_shmid_ds(struct linux_shmid_ds *lsp, struct shmid_ds *bsp) { linux_to_bsd_ipc_perm(&lsp->l_shm_perm, &bsp->shm_perm); @@ -445,9 +415,7 @@ linux_to_bsd_shmid_ds(lsp, bsp) } void -linux_to_bsd_shmid64_ds(lsp, bsp) - struct linux_shmid64_ds *lsp; - struct shmid_ds *bsp; +linux_to_bsd_shmid64_ds(struct linux_shmid64_ds *lsp, struct shmid_ds *bsp) { linux_to_bsd_ipc64_perm(&lsp->l_shm_perm, &bsp->shm_perm); @@ -462,9 +430,7 @@ linux_to_bsd_shmid64_ds(lsp, bsp) } void -bsd_to_linux_shmid_ds(bsp, lsp) - struct shmid_ds *bsp; - struct linux_shmid_ds *lsp; +bsd_to_linux_shmid_ds(struct shmid_ds *bsp, struct linux_shmid_ds *lsp) { bsd_to_linux_ipc_perm(&bsp->shm_perm, &lsp->l_shm_perm); @@ -479,9 +445,7 @@ bsd_to_linux_shmid_ds(bsp, lsp) } void -bsd_to_linux_shmid64_ds(bsp, lsp) - struct shmid_ds *bsp; - struct linux_shmid64_ds *lsp; +bsd_to_linux_shmid64_ds(struct shmid_ds *bsp, struct linux_shmid64_ds *lsp) { bsd_to_linux_ipc64_perm(&bsp->shm_perm, &lsp->l_shm_perm); lsp->l_shm_segsz = bsp->shm_segsz; @@ -501,10 +465,7 @@ bsd_to_linux_shmid64_ds(bsp, lsp) * The usual structure conversion and massaging is done. */ int -linux_sys_shmctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_shmctl(struct lwp *l, void *v, register_t *retval) { struct linux_sys_shmctl_args /* { syscallarg(int) shmid; diff --git a/sys/compat/linux/common/linux_ipccall.c b/sys/compat/linux/common/linux_ipccall.c index 1c0c57a2531..3502add179d 100644 --- a/sys/compat/linux/common/linux_ipccall.c +++ b/sys/compat/linux/common/linux_ipccall.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_ipccall.c,v 1.28 2007/03/04 06:01:23 christos Exp $ */ +/* $NetBSD: linux_ipccall.c,v 1.29 2007/12/08 18:36:07 dsl Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_ipccall.c,v 1.28 2007/03/04 06:01:23 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_ipccall.c,v 1.29 2007/12/08 18:36:07 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_sysv.h" @@ -86,10 +86,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_ipccall.c,v 1.28 2007/03/04 06:01:23 christos */ int -linux_sys_ipc(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_ipc(struct lwp *l, void *v, register_t *retval) { struct linux_sys_ipc_args /* { syscallarg(int) what; diff --git a/sys/compat/linux/common/linux_llseek.c b/sys/compat/linux/common/linux_llseek.c index 475c9376c20..547859e1023 100644 --- a/sys/compat/linux/common/linux_llseek.c +++ b/sys/compat/linux/common/linux_llseek.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_llseek.c,v 1.29 2007/03/04 06:01:23 christos Exp $ */ +/* $NetBSD: linux_llseek.c,v 1.30 2007/12/08 18:36:08 dsl Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_llseek.c,v 1.29 2007/03/04 06:01:23 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_llseek.c,v 1.30 2007/12/08 18:36:08 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -62,10 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_llseek.c,v 1.29 2007/03/04 06:01:23 christos E * This appears to be part of a Linux attempt to switch to 64 bits file sizes. */ int -linux_sys_llseek(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_llseek(struct lwp *l, void *v, register_t *retval) { struct linux_sys_llseek_args /* { syscallarg(int) fd; diff --git a/sys/compat/linux/common/linux_misc.c b/sys/compat/linux/common/linux_misc.c index 4646cb0a8be..715e6eeee9b 100644 --- a/sys/compat/linux/common/linux_misc.c +++ b/sys/compat/linux/common/linux_misc.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_misc.c,v 1.188 2007/12/04 18:40:16 dsl Exp $ */ +/* $NetBSD: linux_misc.c,v 1.189 2007/12/08 18:36:08 dsl Exp $ */ /*- * Copyright (c) 1995, 1998, 1999 The NetBSD Foundation, Inc. @@ -64,7 +64,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.188 2007/12/04 18:40:16 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.189 2007/12/08 18:36:08 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_ptrace.h" @@ -220,10 +220,7 @@ bsd_to_linux_wstat(int st) * it to what Linux wants. */ int -linux_sys_wait4(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_wait4(struct lwp *l, void *v, register_t *retval) { struct linux_sys_wait4_args /* { syscallarg(int) pid; @@ -280,10 +277,7 @@ linux_sys_wait4(l, v, retval) * done in the kernel in Linux. NetBSD does it in the library. */ int -linux_sys_brk(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_brk(struct lwp *l, void *v, register_t *retval) { struct linux_sys_brk_args /* { syscallarg(char *) nsize; @@ -310,10 +304,7 @@ linux_sys_brk(l, v, retval) * Implement the fs stat functions. Straightforward. */ int -linux_sys_statfs(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_statfs(struct lwp *l, void *v, register_t *retval) { struct linux_sys_statfs_args /* { syscallarg(const char *) path; @@ -335,10 +326,7 @@ linux_sys_statfs(l, v, retval) } int -linux_sys_fstatfs(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_fstatfs(struct lwp *l, void *v, register_t *retval) { struct linux_sys_fstatfs_args /* { syscallarg(int) fd; @@ -391,10 +379,7 @@ linux_sys_uname(struct lwp *l, void *v, register_t *retval) * Only called directly on machines with >= 6 free regs. */ int -linux_sys_mmap(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_mmap(struct lwp *l, void *v, register_t *retval) { struct linux_sys_mmap_args /* { syscallarg(unsigned long) addr; @@ -421,10 +406,7 @@ linux_sys_mmap(l, v, retval) * point, and the actual syscall. */ int -linux_sys_mmap2(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_mmap2(struct lwp *l, void *v, register_t *retval) { struct linux_sys_mmap2_args /* { syscallarg(unsigned long) addr; @@ -443,11 +425,7 @@ linux_sys_mmap2(l, v, retval) * Massage arguments and call system mmap(2). */ static int -linux_mmap(l, uap, retval, offset) - struct lwp *l; - struct linux_sys_mmap_args *uap; - register_t *retval; - off_t offset; +linux_mmap(struct lwp *l, struct linux_sys_mmap_args *uap, register_t *retval, off_t offset) { struct sys_mmap_args cma; int error; @@ -492,9 +470,7 @@ linux_mmap(l, uap, retval, offset) } static void -linux_to_bsd_mmap_args(cma, uap) - struct sys_mmap_args *cma; - const struct linux_sys_mmap_args *uap; +linux_to_bsd_mmap_args(struct sys_mmap_args *cma, const struct linux_sys_mmap_args *uap) { int flags = MAP_TRYFIXED, fl = SCARG(uap, flags); @@ -518,10 +494,7 @@ linux_to_bsd_mmap_args(cma, uap) #define LINUX_MREMAP_FIXED 2 int -linux_sys_mremap(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_mremap(struct lwp *l, void *v, register_t *retval) { struct linux_sys_mremap_args /* { syscallarg(void *) old_address; @@ -577,10 +550,7 @@ done: } int -linux_sys_msync(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_msync(struct lwp *l, void *v, register_t *retval) { struct linux_sys_msync_args /* { syscallarg(void *) addr; @@ -671,10 +641,7 @@ linux_sys_mprotect(struct lwp *l, void *v, register_t *retval) #define CONVTCK(r) (r.tv_sec * hz + r.tv_usec / (1000000 / hz)) int -linux_sys_times(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_times(struct lwp *l, void *v, register_t *retval) { struct linux_sys_times_args /* { syscallarg(struct times *) tms; @@ -722,10 +689,7 @@ linux_sys_times(l, v, retval) * Note that this doesn't handle union-mounted filesystems. */ int -linux_sys_getdents(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_getdents(struct lwp *l, void *v, register_t *retval) { struct linux_sys_getdents_args /* { syscallarg(int) fd; @@ -887,10 +851,7 @@ out1: * this. */ int -linux_sys_select(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_select(struct lwp *l, void *v, register_t *retval) { struct linux_sys_select_args /* { syscallarg(int) nfds; @@ -986,10 +947,7 @@ linux_select1(l, retval, nfds, readfds, writefds, exceptfds, timeout) * and return the value. */ int -linux_sys_getpgid(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_getpgid(struct lwp *l, void *v, register_t *retval) { struct linux_sys_getpgid_args /* { syscallarg(int) pid; @@ -1034,10 +992,7 @@ linux_sys_personality(struct lwp *l, void *v, register_t *retval) */ #ifndef COMPAT_LINUX32 int -linux_sys_setreuid16(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_setreuid16(struct lwp *l, void *v, register_t *retval) { struct linux_sys_setreuid16_args /* { syscallarg(int) ruid; @@ -1054,10 +1009,7 @@ linux_sys_setreuid16(l, v, retval) } int -linux_sys_setregid16(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_setregid16(struct lwp *l, void *v, register_t *retval) { struct linux_sys_setregid16_args /* { syscallarg(int) rgid; @@ -1074,10 +1026,7 @@ linux_sys_setregid16(l, v, retval) } int -linux_sys_setresuid16(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_setresuid16(struct lwp *l, void *v, register_t *retval) { struct linux_sys_setresuid16_args /* { syscallarg(uid_t) ruid; @@ -1097,10 +1046,7 @@ linux_sys_setresuid16(l, v, retval) } int -linux_sys_setresgid16(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_setresgid16(struct lwp *l, void *v, register_t *retval) { struct linux_sys_setresgid16_args /* { syscallarg(gid_t) rgid; @@ -1121,10 +1067,7 @@ linux_sys_setresgid16(l, v, retval) #endif /* COMPAT_LINUX32 */ int -linux_sys_getgroups16(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_getgroups16(struct lwp *l, void *v, register_t *retval) { struct linux_sys_getgroups16_args /* { syscallarg(int) gidsetsize; @@ -1166,10 +1109,7 @@ linux_sys_getgroups16(l, v, retval) #define COMPAT_NGROUPS16 16 int -linux_sys_setgroups16(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_setgroups16(struct lwp *l, void *v, register_t *retval) { struct linux_sys_setgroups16_args /* { syscallarg(int) gidsetsize; @@ -1209,10 +1149,7 @@ linux_sys_setgroups16(l, v, retval) * If modification is requested, refuse. */ int -linux_sys_setfsuid(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_setfsuid(struct lwp *l, void *v, register_t *retval) { struct linux_sys_setfsuid_args /* { syscallarg(uid_t) uid; @@ -1229,10 +1166,7 @@ linux_sys_setfsuid(l, v, retval) /* XXX XXX XXX */ # ifndef alpha int -linux_sys_getfsuid(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_getfsuid(struct lwp *l, void *v, register_t *retval) { return sys_getuid(l, v, retval); } @@ -1293,10 +1227,7 @@ linux_sys_getresuid(struct lwp *l, void *v, register_t *retval) } int -linux_sys_ptrace(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_ptrace(struct lwp *l, void *v, register_t *retval) { #if defined(PTRACE) || defined(_LKM) struct linux_sys_ptrace_args /* { @@ -1415,10 +1346,7 @@ linux_sys_reboot(struct lwp *l, void *v, register_t *retval) * Copy of compat_12_sys_swapon(). */ int -linux_sys_swapon(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_swapon(struct lwp *l, void *v, register_t *retval) { struct sys_swapctl_args ua; struct linux_sys_swapon_args /* { @@ -1435,10 +1363,7 @@ linux_sys_swapon(l, v, retval) * Stop swapping to the file or block device specified by path. */ int -linux_sys_swapoff(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_swapoff(struct lwp *l, void *v, register_t *retval) { struct sys_swapctl_args ua; struct linux_sys_swapoff_args /* { @@ -1505,10 +1430,7 @@ linux_sys_sysinfo(struct lwp *l, void *v, register_t *retval) } int -linux_sys_getrlimit(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_getrlimit(struct lwp *l, void *v, register_t *retval) { struct linux_sys_getrlimit_args /* { syscallarg(int) which; @@ -1535,10 +1457,7 @@ linux_sys_getrlimit(l, v, retval) } int -linux_sys_setrlimit(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_setrlimit(struct lwp *l, void *v, register_t *retval) { struct linux_sys_setrlimit_args /* { syscallarg(int) which; @@ -1571,10 +1490,7 @@ linux_sys_setrlimit(l, v, retval) # if !defined(__mips__) && !defined(__amd64__) /* XXX: this doesn't look 100% common, at least mips doesn't have it */ int -linux_sys_ugetrlimit(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_ugetrlimit(struct lwp *l, void *v, register_t *retval) { return linux_sys_getrlimit(l, v, retval); } @@ -1593,10 +1509,7 @@ linux_sys_nosys(struct lwp *l, void *v, } int -linux_sys_getpriority(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_getpriority(struct lwp *l, void *v, register_t *retval) { struct linux_sys_getpriority_args /* { syscallarg(int) which; diff --git a/sys/compat/linux/common/linux_misc_notalpha.c b/sys/compat/linux/common/linux_misc_notalpha.c index 8715cdb875f..03d6ae82d8a 100644 --- a/sys/compat/linux/common/linux_misc_notalpha.c +++ b/sys/compat/linux/common/linux_misc_notalpha.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_misc_notalpha.c,v 1.97 2007/11/25 00:35:26 elad Exp $ */ +/* $NetBSD: linux_misc_notalpha.c,v 1.98 2007/12/08 18:36:08 dsl Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_misc_notalpha.c,v 1.97 2007/11/25 00:35:26 elad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_misc_notalpha.c,v 1.98 2007/12/08 18:36:08 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -96,10 +96,7 @@ static void bsd_to_linux_statfs64(const struct statvfs *, * Fiddle with the timers to make it work. */ int -linux_sys_alarm(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_alarm(struct lwp *l, void *v, register_t *retval) { struct linux_sys_alarm_args /* { syscallarg(unsigned int) secs; @@ -190,10 +187,7 @@ linux_sys_alarm(l, v, retval) #if !defined(__amd64__) int -linux_sys_nice(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_nice(struct lwp *l, void *v, register_t *retval) { struct linux_sys_nice_args /* { syscallarg(int) incr; @@ -219,10 +213,7 @@ linux_sys_nice(l, v, retval) * really is the reclen, not the namelength. */ int -linux_sys_readdir(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_readdir(struct lwp *l, void *v, register_t *retval) { struct linux_sys_readdir_args /* { syscallarg(int) fd; @@ -264,10 +255,7 @@ linux_sys_time(struct lwp *l, void *v, register_t *retval) * and pass it on. */ int -linux_sys_utime(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_utime(struct lwp *l, void *v, register_t *retval) { struct linux_sys_utime_args /* { syscallarg(const char *) path; @@ -296,10 +284,7 @@ linux_sys_utime(l, v, retval) * waitpid(2). Just forward on to linux_sys_wait4 with a NULL rusage. */ int -linux_sys_waitpid(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_waitpid(struct lwp *l, void *v, register_t *retval) { struct linux_sys_waitpid_args /* { syscallarg(int) pid; @@ -406,9 +391,7 @@ linux_sys_stime(struct lwp *l, void *v, register_t *retval) * statvfs() doesn't use statfs64(). */ static void -bsd_to_linux_statfs64(bsp, lsp) - const struct statvfs *bsp; - struct linux_statfs64 *lsp; +bsd_to_linux_statfs64(const struct statvfs *bsp, struct linux_statfs64 *lsp) { int i, div; @@ -446,10 +429,7 @@ bsd_to_linux_statfs64(bsp, lsp) * Implement the fs stat functions. Straightforward. */ int -linux_sys_statfs64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_statfs64(struct lwp *l, void *v, register_t *retval) { struct linux_sys_statfs64_args /* { syscallarg(const char *) path; @@ -474,10 +454,7 @@ linux_sys_statfs64(l, v, retval) } int -linux_sys_fstatfs64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_fstatfs64(struct lwp *l, void *v, register_t *retval) { struct linux_sys_fstatfs64_args /* { syscallarg(int) fd; diff --git a/sys/compat/linux/common/linux_oldmmap.c b/sys/compat/linux/common/linux_oldmmap.c index a9eb810bc47..fe5a5279e6b 100644 --- a/sys/compat/linux/common/linux_oldmmap.c +++ b/sys/compat/linux/common/linux_oldmmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_oldmmap.c,v 1.66 2007/02/09 21:55:19 ad Exp $ */ +/* $NetBSD: linux_oldmmap.c,v 1.67 2007/12/08 18:36:08 dsl Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_oldmmap.c,v 1.66 2007/02/09 21:55:19 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_oldmmap.c,v 1.67 2007/12/08 18:36:08 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -78,10 +78,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_oldmmap.c,v 1.66 2007/02/09 21:55:19 ad Exp $" * They just pass everything in a structure. */ int -linux_sys_old_mmap(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_old_mmap(struct lwp *l, void *v, register_t *retval) { struct linux_sys_old_mmap_args /* { syscallarg(struct linux_oldmmap *) lmp; diff --git a/sys/compat/linux/common/linux_oldselect.c b/sys/compat/linux/common/linux_oldselect.c index fe3655c125e..3c389a27360 100644 --- a/sys/compat/linux/common/linux_oldselect.c +++ b/sys/compat/linux/common/linux_oldselect.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_oldselect.c,v 1.54 2007/02/09 21:55:19 ad Exp $ */ +/* $NetBSD: linux_oldselect.c,v 1.55 2007/12/08 18:36:08 dsl Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_oldselect.c,v 1.54 2007/02/09 21:55:19 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_oldselect.c,v 1.55 2007/12/08 18:36:08 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -62,10 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_oldselect.c,v 1.54 2007/02/09 21:55:19 ad Exp * in registers on the i386 like Linux wants to. */ int -linux_sys_oldselect(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_oldselect(struct lwp *l, void *v, register_t *retval) { struct linux_sys_oldselect_args /* { syscallarg(struct linux_oldselect *) lsp; diff --git a/sys/compat/linux/common/linux_pipe.c b/sys/compat/linux/common/linux_pipe.c index 42138fb68a0..94b3f88cbf4 100644 --- a/sys/compat/linux/common/linux_pipe.c +++ b/sys/compat/linux/common/linux_pipe.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_pipe.c,v 1.59 2007/10/19 18:52:11 njoly Exp $ */ +/* $NetBSD: linux_pipe.c,v 1.60 2007/12/08 18:36:09 dsl Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_pipe.c,v 1.59 2007/10/19 18:52:11 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_pipe.c,v 1.60 2007/12/08 18:36:09 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -66,10 +66,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_pipe.c,v 1.59 2007/10/19 18:52:11 njoly Exp $" * Linux directly passes the pointer. */ int -linux_sys_pipe(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_pipe(struct lwp *l, void *v, register_t *retval) { struct linux_sys_pipe_args /* { syscallarg(int *) pfds; diff --git a/sys/compat/linux/common/linux_sched.c b/sys/compat/linux/common/linux_sched.c index 7bc233a4289..ce72ba46d0b 100644 --- a/sys/compat/linux/common/linux_sched.c +++ b/sys/compat/linux/common/linux_sched.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_sched.c,v 1.44 2007/10/19 18:52:11 njoly Exp $ */ +/* $NetBSD: linux_sched.c,v 1.45 2007/12/08 18:36:09 dsl Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_sched.c,v 1.44 2007/10/19 18:52:11 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_sched.c,v 1.45 2007/12/08 18:36:09 dsl Exp $"); #include <sys/param.h> #include <sys/mount.h> @@ -69,10 +69,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_sched.c,v 1.44 2007/10/19 18:52:11 njoly Exp $ #include <compat/linux/common/linux_sched.h> int -linux_sys_clone(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_clone(struct lwp *l, void *v, register_t *retval) { struct linux_sys_clone_args /* { syscallarg(int) flags; @@ -266,10 +263,7 @@ linux_sys_sched_setscheduler(struct lwp *cl, void *v, } int -linux_sys_sched_getscheduler(cl, v, retval) - struct lwp *cl; - void *v; - register_t *retval; +linux_sys_sched_getscheduler(struct lwp *cl, void *v, register_t *retval) { struct linux_sys_sched_getscheduler_args /* { syscallarg(linux_pid_t) pid; @@ -354,10 +348,7 @@ linux_sys_sched_get_priority_min(struct lwp *cl, void *v, #ifndef __m68k__ /* Present on everything but m68k */ int -linux_sys_exit_group(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_exit_group(struct lwp *l, void *v, register_t *retval) { #ifdef LINUX_NPTL struct linux_sys_exit_group_args /* { @@ -422,10 +413,7 @@ linux_sys_exit_group(l, v, retval) #ifdef LINUX_NPTL int -linux_sys_set_tid_address(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_set_tid_address(struct lwp *l, void *v, register_t *retval) { struct linux_sys_set_tid_address_args /* { syscallarg(int *) tidptr; @@ -444,10 +432,7 @@ linux_sys_set_tid_address(l, v, retval) /* ARGUSED1 */ int -linux_sys_gettid(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_gettid(struct lwp *l, void *v, register_t *retval) { /* The Linux kernel does it exactly that way */ *retval = l->l_proc->p_pid; @@ -457,10 +442,7 @@ linux_sys_gettid(l, v, retval) #ifdef LINUX_NPTL /* ARGUSED1 */ int -linux_sys_getpid(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_getpid(struct lwp *l, void *v, register_t *retval) { struct linux_emuldata *led = l->l_proc->p_emuldata; @@ -476,10 +458,7 @@ linux_sys_getpid(l, v, retval) /* ARGUSED1 */ int -linux_sys_getppid(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_getppid(struct lwp *l, void *v, register_t *retval) { struct proc *p = l->l_proc; struct linux_emuldata *led = p->p_emuldata; @@ -516,10 +495,7 @@ linux_sys_getppid(l, v, retval) #endif /* LINUX_NPTL */ int -linux_sys_sched_getaffinity(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_sched_getaffinity(struct lwp *l, void *v, register_t *retval) { struct linux_sys_sched_getaffinity_args /* { syscallarg(pid_t) pid; @@ -560,10 +536,7 @@ linux_sys_sched_getaffinity(l, v, retval) } int -linux_sys_sched_setaffinity(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_sched_setaffinity(struct lwp *l, void *v, register_t *retval) { struct linux_sys_sched_setaffinity_args /* { syscallarg(pid_t) pid; diff --git a/sys/compat/linux/common/linux_sig_notalpha.c b/sys/compat/linux/common/linux_sig_notalpha.c index 060861a15e9..7b4bd5263d6 100644 --- a/sys/compat/linux/common/linux_sig_notalpha.c +++ b/sys/compat/linux/common/linux_sig_notalpha.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_sig_notalpha.c,v 1.34 2007/10/19 18:52:12 njoly Exp $ */ +/* $NetBSD: linux_sig_notalpha.c,v 1.35 2007/12/08 18:36:09 dsl Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_sig_notalpha.c,v 1.34 2007/10/19 18:52:12 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_sig_notalpha.c,v 1.35 2007/12/08 18:36:09 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -73,10 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_sig_notalpha.c,v 1.34 2007/10/19 18:52:12 njol * sigaction() apply. */ int -linux_sys_signal(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_signal(struct lwp *l, void *v, register_t *retval) { struct linux_sys_signal_args /* { syscallarg(int) signum; @@ -127,10 +124,7 @@ linux_sys_siggetmask(struct lwp *l, void *v, * they are here, and have not been mapped directly. */ int -linux_sys_sigsetmask(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_sigsetmask(struct lwp *l, void *v, register_t *retval) { struct linux_sys_sigsetmask_args /* { syscallarg(linux_old_sigset_t) mask; diff --git a/sys/compat/linux/common/linux_signal.c b/sys/compat/linux/common/linux_signal.c index a57e5a0a8a0..3c79ef5c58c 100644 --- a/sys/compat/linux/common/linux_signal.c +++ b/sys/compat/linux/common/linux_signal.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_signal.c,v 1.56 2007/12/04 18:40:17 dsl Exp $ */ +/* $NetBSD: linux_signal.c,v 1.57 2007/12/08 18:36:09 dsl Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -55,7 +55,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_signal.c,v 1.56 2007/12/04 18:40:17 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_signal.c,v 1.57 2007/12/08 18:36:09 dsl Exp $"); #define COMPAT_LINUX 1 @@ -107,10 +107,7 @@ extern const int linux_to_native_signo[]; */ #if LINUX__NSIG_WORDS > 1 void -linux_old_extra_to_native_sigset(bss, lss, extra) - sigset_t *bss; - const linux_old_sigset_t *lss; - const unsigned long *extra; +linux_old_extra_to_native_sigset(sigset_t *bss, const linux_old_sigset_t *lss, const unsigned long *extra) { linux_sigset_t lsnew; @@ -125,10 +122,7 @@ linux_old_extra_to_native_sigset(bss, lss, extra) } void -native_to_linux_old_extra_sigset(lss, extra, bss) - linux_old_sigset_t *lss; - unsigned long *extra; - const sigset_t *bss; +native_to_linux_old_extra_sigset(linux_old_sigset_t *lss, unsigned long *extra, const sigset_t *bss) { linux_sigset_t lsnew; @@ -143,9 +137,7 @@ native_to_linux_old_extra_sigset(lss, extra, bss) #endif /* LINUX__NSIG_WORDS > 1 */ void -linux_to_native_sigset(bss, lss) - sigset_t *bss; - const linux_sigset_t *lss; +linux_to_native_sigset(sigset_t *bss, const linux_sigset_t *lss) { int i, newsig; @@ -160,9 +152,7 @@ linux_to_native_sigset(bss, lss) } void -native_to_linux_sigset(lss, bss) - linux_sigset_t *lss; - const sigset_t *bss; +native_to_linux_sigset(linux_sigset_t *lss, const sigset_t *bss) { int i, newsig; @@ -177,8 +167,7 @@ native_to_linux_sigset(lss, bss) } unsigned int -native_to_linux_sigflags(bsf) - const int bsf; +native_to_linux_sigflags(const int bsf) { unsigned int lsf = 0; if ((bsf & SA_NOCLDSTOP) != 0) @@ -199,8 +188,7 @@ native_to_linux_sigflags(bsf) } int -linux_to_native_sigflags(lsf) - const unsigned long lsf; +linux_to_native_sigflags(const unsigned long lsf) { int bsf = 0; if ((lsf & LINUX_SA_NOCLDSTOP) != 0) @@ -228,9 +216,7 @@ linux_to_native_sigflags(lsf) * Convert between Linux and BSD sigaction structures. */ void -linux_old_to_native_sigaction(bsa, lsa) - struct sigaction *bsa; - const struct linux_old_sigaction *lsa; +linux_old_to_native_sigaction(struct sigaction *bsa, const struct linux_old_sigaction *lsa) { bsa->sa_handler = lsa->linux_sa_handler; linux_old_to_native_sigset(&bsa->sa_mask, &lsa->linux_sa_mask); @@ -238,9 +224,7 @@ linux_old_to_native_sigaction(bsa, lsa) } void -native_to_linux_old_sigaction(lsa, bsa) - struct linux_old_sigaction *lsa; - const struct sigaction *bsa; +native_to_linux_old_sigaction(struct linux_old_sigaction *lsa, const struct sigaction *bsa) { lsa->linux_sa_handler = bsa->sa_handler; native_to_linux_old_sigset(&lsa->linux_sa_mask, &bsa->sa_mask); @@ -252,9 +236,7 @@ native_to_linux_old_sigaction(lsa, bsa) /* ...and the new sigaction conversion funcs. */ void -linux_to_native_sigaction(bsa, lsa) - struct sigaction *bsa; - const struct linux_sigaction *lsa; +linux_to_native_sigaction(struct sigaction *bsa, const struct linux_sigaction *lsa) { bsa->sa_handler = lsa->linux_sa_handler; linux_to_native_sigset(&bsa->sa_mask, &lsa->linux_sa_mask); @@ -262,9 +244,7 @@ linux_to_native_sigaction(bsa, lsa) } void -native_to_linux_sigaction(lsa, bsa) - struct linux_sigaction *lsa; - const struct sigaction *bsa; +native_to_linux_sigaction(struct linux_sigaction *lsa, const struct sigaction *bsa) { lsa->linux_sa_handler = bsa->sa_handler; native_to_linux_sigset(&lsa->linux_sa_mask, &bsa->sa_mask); @@ -350,11 +330,7 @@ linux_sys_rt_sigaction(struct lwp *l, void *v, register_t *retval) } int -linux_sigprocmask1(l, how, set, oset) - struct lwp *l; - int how; - const linux_old_sigset_t *set; - linux_old_sigset_t *oset; +linux_sigprocmask1(struct lwp *l, int how, const linux_old_sigset_t *set, linux_old_sigset_t *oset) { struct proc *p = l->l_proc; linux_old_sigset_t nlss, olss; @@ -526,10 +502,7 @@ linux_sys_rt_sigsuspend(struct lwp *l, void *v, register_t *retval) * Note: also used as sys_rt_queueinfo. The info field is ignored. */ int -linux_sys_rt_queueinfo(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_rt_queueinfo(struct lwp *l, void *v, register_t *retval) { /* XXX XAX This isn't this really int, int, siginfo_t *, is it? */ #if 0 @@ -546,10 +519,7 @@ linux_sys_rt_queueinfo(l, v, retval) } int -linux_sys_kill(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_kill(struct lwp *l, void *v, register_t *retval) { struct linux_sys_kill_args /* { syscallarg(int) pid; @@ -572,9 +542,7 @@ static void linux_to_native_sigaltstack(struct sigaltstack *, const struct linux_sigaltstack *); static void -linux_to_native_sigaltstack(bss, lss) - struct sigaltstack *bss; - const struct linux_sigaltstack *lss; +linux_to_native_sigaltstack(struct sigaltstack *bss, const struct linux_sigaltstack *lss) { bss->ss_sp = lss->ss_sp; bss->ss_size = lss->ss_size; @@ -587,9 +555,7 @@ linux_to_native_sigaltstack(bss, lss) } void -native_to_linux_sigaltstack(lss, bss) - struct linux_sigaltstack *lss; - const struct sigaltstack *bss; +native_to_linux_sigaltstack(struct linux_sigaltstack *lss, const struct sigaltstack *bss) { lss->ss_sp = bss->ss_sp; lss->ss_size = bss->ss_size; @@ -646,10 +612,7 @@ linux_sys_sigaltstack(struct lwp *l, void *v, register_t *retval) #ifdef LINUX_NPTL int -linux_sys_tkill(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_tkill(struct lwp *l, void *v, register_t *retval) { struct linux_sys_tkill_args /* { syscallarg(int) tid; @@ -665,10 +628,7 @@ linux_sys_tkill(l, v, retval) } int -linux_sys_tgkill(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_tgkill(struct lwp *l, void *v, register_t *retval) { struct linux_sys_tgkill_args /* { syscallarg(int) tgid; diff --git a/sys/compat/linux/common/linux_socket.c b/sys/compat/linux/common/linux_socket.c index f6ed9704e17..2bfa15f5104 100644 --- a/sys/compat/linux/common/linux_socket.c +++ b/sys/compat/linux/common/linux_socket.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_socket.c,v 1.83 2007/12/05 22:51:57 dyoung Exp $ */ +/* $NetBSD: linux_socket.c,v 1.84 2007/12/08 18:36:10 dsl Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.83 2007/12/05 22:51:57 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.84 2007/12/08 18:36:10 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_inet.h" @@ -220,8 +220,7 @@ static const struct { * Convert between Linux and BSD socket domain values */ static int -linux_to_bsd_domain(ldom) - int ldom; +linux_to_bsd_domain(int ldom) { if (ldom < 0 || ldom >= LINUX_AF_MAX) return (-1); @@ -233,8 +232,7 @@ linux_to_bsd_domain(ldom) * Convert between BSD and Linux socket domain values */ static int -bsd_to_linux_domain(bdom) - int bdom; +bsd_to_linux_domain(int bdom) { if (bdom < 0 || bdom >= AF_MAX) return (-1); @@ -243,8 +241,7 @@ bsd_to_linux_domain(bdom) } static int -linux_to_bsd_msg_flags(lflag) - int lflag; +linux_to_bsd_msg_flags(int lflag) { int i, lfl, bfl; int bflag = 0; @@ -271,8 +268,7 @@ linux_to_bsd_msg_flags(lflag) } static int -bsd_to_linux_msg_flags(bflag) - int bflag; +bsd_to_linux_msg_flags(int bflag) { int i, lfl, bfl; int lflag = 0; @@ -299,10 +295,7 @@ bsd_to_linux_msg_flags(bflag) } int -linux_sys_socket(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_socket(struct lwp *l, void *v, register_t *retval) { struct linux_sys_socket_args /* { syscallarg(int) domain; @@ -349,10 +342,7 @@ linux_sys_socket(l, v, retval) } int -linux_sys_socketpair(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_socketpair(struct lwp *l, void *v, register_t *retval) { struct linux_sys_socketpair_args /* { syscallarg(int) domain; @@ -373,10 +363,7 @@ linux_sys_socketpair(l, v, retval) } int -linux_sys_sendto(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_sendto(struct lwp *l, void *v, register_t *retval) { struct linux_sys_sendto_args /* { syscallarg(int) s; @@ -417,10 +404,7 @@ linux_sys_sendto(l, v, retval) } int -linux_sys_sendmsg(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_sendmsg(struct lwp *l, void *v, register_t *retval) { struct linux_sys_sendmsg_args /* { syscallarg(int) s; @@ -578,10 +562,7 @@ done: } int -linux_sys_recvfrom(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_recvfrom(struct lwp *l, void *v, register_t *retval) { struct linux_sys_recvfrom_args /* { syscallarg(int) s; @@ -703,10 +684,7 @@ linux_copyout_msg_control(struct lwp *l, struct msghdr *mp, struct mbuf *control } int -linux_sys_recvmsg(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_recvmsg(struct lwp *l, void *v, register_t *retval) { struct linux_sys_recvmsg_args /* { syscallarg(int) s; @@ -764,8 +742,7 @@ linux_sys_recvmsg(l, v, retval) * is different, the rest matches IPPROTO_* on both systems. */ int -linux_to_bsd_sopt_level(llevel) - int llevel; +linux_to_bsd_sopt_level(int llevel) { switch (llevel) { @@ -786,8 +763,7 @@ linux_to_bsd_sopt_level(llevel) * Convert Linux socket level socket option numbers to NetBSD values. */ int -linux_to_bsd_so_sockopt(lopt) - int lopt; +linux_to_bsd_so_sockopt(int lopt) { switch (lopt) { @@ -831,8 +807,7 @@ linux_to_bsd_so_sockopt(lopt) * Convert Linux IP level socket option number to NetBSD values. */ int -linux_to_bsd_ip_sockopt(lopt) - int lopt; +linux_to_bsd_ip_sockopt(int lopt) { switch (lopt) { @@ -859,8 +834,7 @@ linux_to_bsd_ip_sockopt(lopt) * Convert Linux TCP level socket option number to NetBSD values. */ int -linux_to_bsd_tcp_sockopt(lopt) - int lopt; +linux_to_bsd_tcp_sockopt(int lopt) { switch (lopt) { @@ -877,8 +851,7 @@ linux_to_bsd_tcp_sockopt(lopt) * Convert Linux UDP level socket option number to NetBSD values. */ int -linux_to_bsd_udp_sockopt(lopt) - int lopt; +linux_to_bsd_udp_sockopt(int lopt) { switch (lopt) { @@ -894,10 +867,7 @@ linux_to_bsd_udp_sockopt(lopt) * need conversion, as they are the same on both systems. */ int -linux_sys_setsockopt(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_setsockopt(struct lwp *l, void *v, register_t *retval) { struct linux_sys_setsockopt_args /* { syscallarg(int) s; @@ -966,10 +936,7 @@ linux_sys_setsockopt(l, v, retval) * getsockopt(2) is very much the same as setsockopt(2) (see above) */ int -linux_sys_getsockopt(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_getsockopt(struct lwp *l, void *v, register_t *retval) { struct linux_sys_getsockopt_args /* { syscallarg(int) s; @@ -1244,10 +1211,7 @@ out: } int -linux_sys_connect(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_connect(struct lwp *l, void *v, register_t *retval) { struct linux_sys_connect_args /* { syscallarg(int) s; @@ -1293,10 +1257,7 @@ linux_sys_connect(l, v, retval) } int -linux_sys_bind(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_bind(struct lwp *l, void *v, register_t *retval) { struct linux_sys_bind_args /* { syscallarg(int) s; @@ -1315,10 +1276,7 @@ linux_sys_bind(l, v, retval) } int -linux_sys_getsockname(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_getsockname(struct lwp *l, void *v, register_t *retval) { struct linux_sys_getsockname_args /* { syscallarg(int) fdes; @@ -1337,10 +1295,7 @@ linux_sys_getsockname(l, v, retval) } int -linux_sys_getpeername(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_getpeername(struct lwp *l, void *v, register_t *retval) { struct sys_getpeername_args /* { syscallarg(int) fdes; @@ -1477,8 +1432,7 @@ linux_get_sa(struct lwp *l, int s, struct mbuf **mp, const struct osockaddr *osa } static int -linux_sa_put(osa) - struct osockaddr *osa; +linux_sa_put(struct osockaddr *osa) { struct sockaddr sa; struct osockaddr *kosa; @@ -1510,10 +1464,7 @@ linux_sa_put(osa) #ifndef __amd64__ int -linux_sys_recv(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_recv(struct lwp *l, void *v, register_t *retval) { struct linux_sys_recv_args /* { syscallarg(int) s; @@ -1535,10 +1486,7 @@ linux_sys_recv(l, v, retval) } int -linux_sys_send(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_send(struct lwp *l, void *v, register_t *retval) { struct linux_sys_send_args /* { syscallarg(int) s; @@ -1560,10 +1508,7 @@ linux_sys_send(l, v, retval) #endif int -linux_sys_accept(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_accept(struct lwp *l, void *v, register_t *retval) { struct linux_sys_accept_args /* { syscallarg(int) s; diff --git a/sys/compat/linux/common/linux_socketcall.c b/sys/compat/linux/common/linux_socketcall.c index 31ece68323b..59d359df970 100644 --- a/sys/compat/linux/common/linux_socketcall.c +++ b/sys/compat/linux/common/linux_socketcall.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_socketcall.c,v 1.35 2007/08/15 12:07:30 ad Exp $ */ +/* $NetBSD: linux_socketcall.c,v 1.36 2007/12/08 18:36:10 dsl Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_socketcall.c,v 1.35 2007/08/15 12:07:30 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_socketcall.c,v 1.36 2007/12/08 18:36:10 dsl Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -119,10 +119,7 @@ static const struct { * make and take appropriate action. */ int -linux_sys_socketcall(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_socketcall(struct lwp *l, void *v, register_t *retval) { struct linux_sys_socketcall_args /* { syscallarg(int) what; diff --git a/sys/compat/linux/common/linux_time.c b/sys/compat/linux/common/linux_time.c index 9ff026334df..3b669705822 100644 --- a/sys/compat/linux/common/linux_time.c +++ b/sys/compat/linux/common/linux_time.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_time.c,v 1.20 2007/11/25 00:35:27 elad Exp $ */ +/* $NetBSD: linux_time.c,v 1.21 2007/12/08 18:36:10 dsl Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_time.c,v 1.20 2007/11/25 00:35:27 elad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_time.c,v 1.21 2007/12/08 18:36:10 dsl Exp $"); #include <sys/param.h> #include <sys/ucred.h> @@ -84,10 +84,7 @@ static int linux_to_native_clockid(clockid_t *, clockid_t); struct timezone linux_sys_tz; int -linux_sys_gettimeofday(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_gettimeofday(struct lwp *l, void *v, register_t *retval) { struct linux_sys_gettimeofday_args /* { syscallarg(struct timeval *) tz; @@ -111,10 +108,7 @@ linux_sys_gettimeofday(l, v, retval) } int -linux_sys_settimeofday(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_settimeofday(struct lwp *l, void *v, register_t *retval) { struct linux_sys_settimeofday_args /* { syscallarg(struct timeval *) tp; @@ -178,10 +172,7 @@ linux_to_native_clockid(clockid_t *n, clockid_t l) } int -linux_sys_clock_gettime(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_clock_gettime(struct lwp *l, void *v, register_t *retval) { struct linux_sys_clock_gettime_args /* { syscallarg(clockid_t) which; @@ -206,10 +197,7 @@ linux_sys_clock_gettime(l, v, retval) } int -linux_sys_clock_settime(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_clock_settime(struct lwp *l, void *v, register_t *retval) { struct linux_sys_clock_settime_args /* { syscallarg(clockid_t) which; @@ -236,10 +224,7 @@ linux_sys_clock_settime(l, v, retval) } int -linux_sys_clock_getres(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_clock_getres(struct lwp *l, void *v, register_t *retval) { struct linux_sys_clock_gettime_args /* { syscallarg(clockid_t) which; @@ -261,10 +246,7 @@ linux_sys_clock_getres(l, v, retval) } int -linux_sys_clock_nanosleep(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_clock_nanosleep(struct lwp *l, void *v, register_t *retval) { struct linux_sys_clock_nanosleep_args /* { syscallarg(clockid_t) which; |
