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 | |
| 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')
210 files changed, 2017 insertions, 6277 deletions
diff --git a/sys/compat/aoutm68k/aoutm68k_stat.c b/sys/compat/aoutm68k/aoutm68k_stat.c index fc9bf9d2f7f..1f6236c225f 100644 --- a/sys/compat/aoutm68k/aoutm68k_stat.c +++ b/sys/compat/aoutm68k/aoutm68k_stat.c @@ -1,4 +1,4 @@ -/* $NetBSD: aoutm68k_stat.c,v 1.20 2007/04/30 14:05:47 dsl Exp $ */ +/* $NetBSD: aoutm68k_stat.c,v 1.21 2007/12/08 18:35:53 dsl Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aoutm68k_stat.c,v 1.20 2007/04/30 14:05:47 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aoutm68k_stat.c,v 1.21 2007/12/08 18:35:53 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -74,10 +74,7 @@ static void aoutm68k_stat13_convert(struct stat *, struct aoutm68k_stat *); #ifdef COMPAT_43 int -aoutm68k_compat_43_sys_stat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +aoutm68k_compat_43_sys_stat(struct lwp *l, void *v, register_t *retval) { struct aoutm68k_compat_43_sys_stat_args *uap = v; struct aoutm68k_stat43 ast; @@ -94,10 +91,7 @@ aoutm68k_compat_43_sys_stat(l, v, retval) } int -aoutm68k_compat_43_sys_fstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +aoutm68k_compat_43_sys_fstat(struct lwp *l, void *v, register_t *retval) { struct aoutm68k_compat_43_sys_fstat_args *uap = v; struct aoutm68k_stat43 ast; @@ -114,10 +108,7 @@ aoutm68k_compat_43_sys_fstat(l, v, retval) } int -aoutm68k_compat_43_sys_lstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +aoutm68k_compat_43_sys_lstat(struct lwp *l, void *v, register_t *retval) { struct aoutm68k_compat_43_sys_lstat_args *uap = v; struct aoutm68k_stat43 ast; @@ -136,10 +127,7 @@ aoutm68k_compat_43_sys_lstat(l, v, retval) #ifdef COMPAT_12 int -aoutm68k_compat_12_sys_stat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +aoutm68k_compat_12_sys_stat(struct lwp *l, void *v, register_t *retval) { struct aoutm68k_compat_12_sys_stat_args *uap = v; struct aoutm68k_stat12 ast; @@ -156,10 +144,7 @@ aoutm68k_compat_12_sys_stat(l, v, retval) } int -aoutm68k_compat_12_sys_fstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +aoutm68k_compat_12_sys_fstat(struct lwp *l, void *v, register_t *retval) { struct aoutm68k_compat_12_sys_fstat_args *uap = v; struct aoutm68k_stat12 ast; @@ -176,10 +161,7 @@ aoutm68k_compat_12_sys_fstat(l, v, retval) } int -aoutm68k_compat_12_sys_lstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +aoutm68k_compat_12_sys_lstat(struct lwp *l, void *v, register_t *retval) { struct aoutm68k_compat_12_sys_lstat_args *uap = v; struct aoutm68k_stat12 ast; @@ -197,10 +179,7 @@ aoutm68k_compat_12_sys_lstat(l, v, retval) #endif /* COMPAT_12 */ int -aoutm68k_sys___stat13(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +aoutm68k_sys___stat13(struct lwp *l, void *v, register_t *retval) { struct aoutm68k_sys___stat13_args *uap = v; struct aoutm68k_stat ast; @@ -217,10 +196,7 @@ aoutm68k_sys___stat13(l, v, retval) } int -aoutm68k_sys___fstat13(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +aoutm68k_sys___fstat13(struct lwp *l, void *v, register_t *retval) { struct aoutm68k_sys___fstat13_args *uap = v; struct aoutm68k_stat ast; @@ -238,10 +214,7 @@ aoutm68k_sys___fstat13(l, v, retval) } int -aoutm68k_sys___lstat13(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +aoutm68k_sys___lstat13(struct lwp *l, void *v, register_t *retval) { struct aoutm68k_sys___lstat13_args *uap = v; struct aoutm68k_stat ast; @@ -258,10 +231,7 @@ aoutm68k_sys___lstat13(l, v, retval) } int -aoutm68k_sys_fhstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +aoutm68k_sys_fhstat(struct lwp *l, void *v, register_t *retval) { struct aoutm68k_sys_fhstat_args *uap = v; struct aoutm68k_stat ast; @@ -278,9 +248,7 @@ aoutm68k_sys_fhstat(l, v, retval) #ifdef COMPAT_43 static void -aoutm68k_stat43_convert(st, ast) - struct stat *st; - struct aoutm68k_stat43 *ast; +aoutm68k_stat43_convert(struct stat *st, struct aoutm68k_stat43 *ast) { memset(ast, 0, sizeof(*ast)); @@ -310,9 +278,7 @@ aoutm68k_stat43_convert(st, ast) #ifdef COMPAT_12 static void -aoutm68k_stat12_convert(st, ast) - struct stat *st; - struct aoutm68k_stat12 *ast; +aoutm68k_stat12_convert(struct stat *st, struct aoutm68k_stat12 *ast) { memset(ast, 0, sizeof(*ast)); @@ -341,9 +307,7 @@ aoutm68k_stat12_convert(st, ast) #endif /* COMPAT_12 */ static void -aoutm68k_stat13_convert(st, ast) - struct stat *st; - struct aoutm68k_stat *ast; +aoutm68k_stat13_convert(struct stat *st, struct aoutm68k_stat *ast) { memset(ast, 0, sizeof(*ast)); diff --git a/sys/compat/common/compat_exec.c b/sys/compat/common/compat_exec.c index d4a3446db59..cb7dd082179 100644 --- a/sys/compat/common/compat_exec.c +++ b/sys/compat/common/compat_exec.c @@ -1,4 +1,4 @@ -/* $NetBSD: compat_exec.c,v 1.14 2005/12/11 12:19:56 christos Exp $ */ +/* $NetBSD: compat_exec.c,v 1.15 2007/12/08 18:35:53 dsl Exp $ */ /* * Copyright (c) 1993, 1994 Christopher G. Demetriou @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: compat_exec.c,v 1.14 2005/12/11 12:19:56 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_exec.c,v 1.15 2007/12/08 18:35:53 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -50,9 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: compat_exec.c,v 1.14 2005/12/11 12:19:56 christos Ex * There were copies of this in the mac68k, hp300, and i386 ports. */ int -exec_aout_prep_oldzmagic(l, epp) - struct lwp *l; - struct exec_package *epp; +exec_aout_prep_oldzmagic(struct lwp *l, struct exec_package *epp) { struct exec *execp = epp->ep_hdr; int error; @@ -98,9 +96,7 @@ exec_aout_prep_oldzmagic(l, epp) * XXX: There must be a better way to share this code. */ int -exec_aout_prep_oldnmagic(l, epp) - struct lwp *l; - struct exec_package *epp; +exec_aout_prep_oldnmagic(struct lwp *l, struct exec_package *epp) { struct exec *execp = epp->ep_hdr; long bsize, baddr; @@ -142,9 +138,7 @@ exec_aout_prep_oldnmagic(l, epp) * XXX: There must be a better way to share this code. */ int -exec_aout_prep_oldomagic(l, epp) - struct lwp *l; - struct exec_package *epp; +exec_aout_prep_oldomagic(struct lwp *l, struct exec_package *epp) { struct exec *execp = epp->ep_hdr; long dsize, bsize, baddr; diff --git a/sys/compat/common/compat_file.c b/sys/compat/common/compat_file.c index 72c413425a0..ccd3d822cb3 100644 --- a/sys/compat/common/compat_file.c +++ b/sys/compat/common/compat_file.c @@ -1,4 +1,4 @@ -/* $NetBSD: compat_file.c,v 1.23 2007/07/14 15:47:27 dsl Exp $ */ +/* $NetBSD: compat_file.c,v 1.24 2007/12/08 18:35:53 dsl Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: compat_file.c,v 1.23 2007/07/14 15:47:27 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_file.c,v 1.24 2007/12/08 18:35:53 dsl Exp $"); #include "opt_compat_darwin.h" #include "opt_nfsserver.h" @@ -72,10 +72,7 @@ __KERNEL_RCSID(0, "$NetBSD: compat_file.c,v 1.23 2007/07/14 15:47:27 dsl Exp $") #include <compat/common/compat_util.h> int -bsd_sys_open(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_open(struct lwp *l, void *v, register_t *retval) { struct sys_open_args /* { syscallarg(char *) path; @@ -87,10 +84,7 @@ bsd_sys_open(l, v, retval) } int -bsd_compat_43_sys_creat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_compat_43_sys_creat(struct lwp *l, void *v, register_t *retval) { struct compat_43_sys_creat_args /* { syscallarg(char *) path; @@ -101,10 +95,7 @@ bsd_compat_43_sys_creat(l, v, retval) } int -bsd_sys_link(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_link(struct lwp *l, void *v, register_t *retval) { struct sys_link_args /* { syscallarg(char *) path; @@ -115,10 +106,7 @@ bsd_sys_link(l, v, retval) } int -bsd_sys_unlink(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_unlink(struct lwp *l, void *v, register_t *retval) { struct sys_unlink_args /* { syscallarg(char *) path; @@ -128,10 +116,7 @@ bsd_sys_unlink(l, v, retval) } int -bsd_sys_chdir(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_chdir(struct lwp *l, void *v, register_t *retval) { struct sys_chdir_args /* { syscallarg(char *) path; @@ -141,10 +126,7 @@ bsd_sys_chdir(l, v, retval) } int -bsd_sys_mknod(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_mknod(struct lwp *l, void *v, register_t *retval) { struct sys_mknod_args /* { syscallarg(char *) path; @@ -156,10 +138,7 @@ bsd_sys_mknod(l, v, retval) } int -bsd_sys_chmod(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_chmod(struct lwp *l, void *v, register_t *retval) { struct sys_chmod_args /* { syscallarg(char *) path; @@ -170,10 +149,7 @@ bsd_sys_chmod(l, v, retval) } int -bsd_sys_chown(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_chown(struct lwp *l, void *v, register_t *retval) { struct sys_chown_args /* { syscallarg(char *) path; @@ -185,10 +161,7 @@ bsd_sys_chown(l, v, retval) } int -bsd_sys_mount(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_mount(struct lwp *l, void *v, register_t *retval) { struct compat_40_sys_mount_args /* { syscallarg(char *) type; @@ -201,10 +174,7 @@ bsd_sys_mount(l, v, retval) } int -bsd_sys_unmount(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_unmount(struct lwp *l, void *v, register_t *retval) { struct sys_unmount_args /* { syscallarg(char *) path; @@ -215,10 +185,7 @@ bsd_sys_unmount(l, v, retval) } int -bsd_sys_access(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_access(struct lwp *l, void *v, register_t *retval) { struct sys_access_args /* { syscallarg(char *) path; @@ -229,10 +196,7 @@ bsd_sys_access(l, v, retval) } int -bsd_sys_chflags(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_chflags(struct lwp *l, void *v, register_t *retval) { struct sys_chflags_args /* { syscallarg(char *) path; @@ -243,10 +207,7 @@ bsd_sys_chflags(l, v, retval) } int -bsd_compat_43_sys_stat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_compat_43_sys_stat(struct lwp *l, void *v, register_t *retval) { struct compat_43_sys_stat_args /* { syscallarg(char *) path; @@ -257,10 +218,7 @@ bsd_compat_43_sys_stat(l, v, retval) } int -bsd_compat_43_sys_lstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_compat_43_sys_lstat(struct lwp *l, void *v, register_t *retval) { struct compat_43_sys_lstat_args /* { syscallarg(char *) path; @@ -271,10 +229,7 @@ bsd_compat_43_sys_lstat(l, v, retval) } int -bsd_sys_acct(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_acct(struct lwp *l, void *v, register_t *retval) { struct sys_acct_args /* { syscallarg(char *) path; @@ -284,10 +239,7 @@ bsd_sys_acct(l, v, retval) } int -bsd_sys_revoke(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_revoke(struct lwp *l, void *v, register_t *retval) { struct sys_revoke_args /* { syscallarg(char *) path; @@ -297,10 +249,7 @@ bsd_sys_revoke(l, v, retval) } int -bsd_sys_symlink(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_symlink(struct lwp *l, void *v, register_t *retval) { struct sys_symlink_args /* { syscallarg(char *) path; @@ -311,10 +260,7 @@ bsd_sys_symlink(l, v, retval) } int -bsd_sys_readlink(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_readlink(struct lwp *l, void *v, register_t *retval) { struct sys_readlink_args /* { syscallarg(char *) path; @@ -326,10 +272,7 @@ bsd_sys_readlink(l, v, retval) } int -bsd_sys_execve(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_execve(struct lwp *l, void *v, register_t *retval) { struct sys_execve_args /* { syscallarg(char *) path; @@ -346,10 +289,7 @@ bsd_sys_execve(l, v, retval) } int -bsd_sys_chroot(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_chroot(struct lwp *l, void *v, register_t *retval) { struct sys_chroot_args /* { syscallarg(char *) path; @@ -359,10 +299,7 @@ bsd_sys_chroot(l, v, retval) } int -bsd_compat_12_sys_swapon(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_compat_12_sys_swapon(struct lwp *l, void *v, register_t *retval) { struct compat_12_sys_swapon_args /* { syscallarg(char *) name; @@ -372,10 +309,7 @@ bsd_compat_12_sys_swapon(l, v, retval) } int -bsd_sys_bind(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_bind(struct lwp *l, void *v, register_t *retval) { struct sys_bind_args /* { syscallarg(int) s; @@ -387,10 +321,7 @@ bsd_sys_bind(l, v, retval) } int -bsd_sys_connect(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_connect(struct lwp *l, void *v, register_t *retval) { struct sys_connect_args /* { syscallarg(int) s; @@ -402,10 +333,7 @@ bsd_sys_connect(l, v, retval) } int -bsd_sys_rename(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_rename(struct lwp *l, void *v, register_t *retval) { struct sys_rename_args /* { syscallarg(char *) from; @@ -416,10 +344,7 @@ bsd_sys_rename(l, v, retval) } int -bsd_compat_43_sys_truncate(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_compat_43_sys_truncate(struct lwp *l, void *v, register_t *retval) { struct compat_43_sys_truncate_args /* { syscallarg(char *) path; @@ -430,10 +355,7 @@ bsd_compat_43_sys_truncate(l, v, retval) } int -bsd_sys_mkfifo(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_mkfifo(struct lwp *l, void *v, register_t *retval) { struct sys_mkfifo_args /* { syscallarg(char *) path; @@ -444,10 +366,7 @@ bsd_sys_mkfifo(l, v, retval) } int -bsd_sys_mkdir(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_mkdir(struct lwp *l, void *v, register_t *retval) { struct sys_mkdir_args /* { syscallarg(char *) path; @@ -458,10 +377,7 @@ bsd_sys_mkdir(l, v, retval) } int -bsd_sys_rmdir(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_rmdir(struct lwp *l, void *v, register_t *retval) { struct sys_rmdir_args /* { syscallarg(char *) path; @@ -471,10 +387,7 @@ bsd_sys_rmdir(l, v, retval) } int -bsd_sys_utimes(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_utimes(struct lwp *l, void *v, register_t *retval) { struct sys_utimes_args /* { syscallarg(char *) path; @@ -485,10 +398,7 @@ bsd_sys_utimes(l, v, retval) } int -bsd_sys_quotactl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_quotactl(struct lwp *l, void *v, register_t *retval) { struct sys_quotactl_args /* { syscallarg(char *) path; @@ -501,10 +411,7 @@ bsd_sys_quotactl(l, v, retval) } int -bsd_sys_statfs(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_statfs(struct lwp *l, void *v, register_t *retval) { struct compat_20_sys_statfs_args /* { syscallarg(char *) path; @@ -516,10 +423,7 @@ bsd_sys_statfs(l, v, retval) #if defined(NFS) || defined(NFSSERVER) int -bsd_sys_getfh(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_getfh(struct lwp *l, void *v, register_t *retval) { struct compat_30_sys_getfh_args /* { syscallarg(char *) fname; @@ -531,10 +435,7 @@ bsd_sys_getfh(l, v, retval) #endif /* NFS || NFSSERVER */ int -bsd_compat_12_sys_stat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_compat_12_sys_stat(struct lwp *l, void *v, register_t *retval) { struct compat_12_sys_stat_args /* { syscallarg(char *) path; @@ -545,10 +446,7 @@ bsd_compat_12_sys_stat(l, v, retval) } int -bsd_compat_12_sys_lstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_compat_12_sys_lstat(struct lwp *l, void *v, register_t *retval) { struct compat_12_sys_lstat_args /* { syscallarg(char *) path; @@ -559,10 +457,7 @@ bsd_compat_12_sys_lstat(l, v, retval) } int -bsd_sys_pathconf(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_pathconf(struct lwp *l, void *v, register_t *retval) { struct sys_pathconf_args /* { syscallarg(char *) path; @@ -573,10 +468,7 @@ bsd_sys_pathconf(l, v, retval) } int -bsd_sys_truncate(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_truncate(struct lwp *l, void *v, register_t *retval) { struct sys_truncate_args /* { syscallarg(char *) path; @@ -588,10 +480,7 @@ bsd_sys_truncate(l, v, retval) } int -bsd_sys_undelete(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_undelete(struct lwp *l, void *v, register_t *retval) { struct sys_undelete_args /* { syscallarg(char *) path; @@ -601,10 +490,7 @@ bsd_sys_undelete(l, v, retval) } int -bsd_sys_lchmod(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_lchmod(struct lwp *l, void *v, register_t *retval) { struct sys_lchmod_args /* { syscallarg(char *) path; @@ -615,10 +501,7 @@ bsd_sys_lchmod(l, v, retval) } int -bsd_sys_lchown(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_lchown(struct lwp *l, void *v, register_t *retval) { struct sys_lchown_args /* { syscallarg(char *) path; @@ -630,10 +513,7 @@ bsd_sys_lchown(l, v, retval) } int -bsd_sys_lutimes(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_lutimes(struct lwp *l, void *v, register_t *retval) { struct sys_lutimes_args /* { syscallarg(char *) path; @@ -644,10 +524,7 @@ bsd_sys_lutimes(l, v, retval) } int -bsd_sys___stat30(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys___stat30(struct lwp *l, void *v, register_t *retval) { struct sys___stat30_args /* { syscallarg(char *) path; @@ -658,10 +535,7 @@ bsd_sys___stat30(l, v, retval) } int -bsd_sys___lstat30(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys___lstat30(struct lwp *l, void *v, register_t *retval) { struct sys___lstat30_args /* { syscallarg(char *) path; @@ -672,10 +546,7 @@ bsd_sys___lstat30(l, v, retval) } int -bsd_sys___posix_chown(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys___posix_chown(struct lwp *l, void *v, register_t *retval) { struct sys___posix_chown_args /* { syscallarg(char *) path; @@ -687,10 +558,7 @@ bsd_sys___posix_chown(l, v, retval) } int -bsd_sys___posix_lchown(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys___posix_lchown(struct lwp *l, void *v, register_t *retval) { struct sys___posix_lchown_args /* { syscallarg(char *) path; @@ -702,10 +570,7 @@ bsd_sys___posix_lchown(l, v, retval) } int -bsd_sys_lchflags(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +bsd_sys_lchflags(struct lwp *l, void *v, register_t *retval) { struct sys_lchflags_args /* { syscallarg(char *) path; diff --git a/sys/compat/common/compat_util.c b/sys/compat/common/compat_util.c index 94c1c6694ad..872009826eb 100644 --- a/sys/compat/common/compat_util.c +++ b/sys/compat/common/compat_util.c @@ -1,4 +1,4 @@ -/* $NetBSD: compat_util.c,v 1.37 2007/07/13 21:04:29 dsl Exp $ */ +/* $NetBSD: compat_util.c,v 1.38 2007/12/08 18:35:54 dsl Exp $ */ /*- * Copyright (c) 1994 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: compat_util.c,v 1.37 2007/07/13 21:04:29 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_util.c,v 1.38 2007/12/08 18:35:54 dsl Exp $"); #include "opt_systrace.h" @@ -150,9 +150,7 @@ emul_flags_translate(const struct emul_flags_xtab *tab, /* The only user left of the stackgap is the systrace code. */ #if SYSTRACE void * -stackgap_init(p, sz) - const struct proc *p; - size_t sz; +stackgap_init(const struct proc *p, size_t sz) { if (sz == 0) sz = STACKGAPLEN; @@ -166,10 +164,7 @@ stackgap_init(p, sz) void * -stackgap_alloc(p, sgp, sz) - const struct proc *p; - void **sgp; - size_t sz; +stackgap_alloc(const struct proc *p, void **sgp, size_t sz) { void *n = *sgp; void *nsgp; @@ -186,9 +181,7 @@ stackgap_alloc(p, sgp, sz) #endif void -compat_offseterr(vp, msg) - struct vnode *vp; - const char *msg; +compat_offseterr(struct vnode *vp, const char *msg) { struct mount *mp; diff --git a/sys/compat/common/kern_ipc_10.c b/sys/compat/common/kern_ipc_10.c index a355ff820fb..37914991778 100644 --- a/sys/compat/common/kern_ipc_10.c +++ b/sys/compat/common/kern_ipc_10.c @@ -1,4 +1,4 @@ -/* $NetBSD: kern_ipc_10.c,v 1.21 2007/06/17 10:24:21 dsl Exp $ */ +/* $NetBSD: kern_ipc_10.c,v 1.22 2007/12/08 18:35:54 dsl Exp $ */ /* * Copyright (c) 1994 Adam Glass and Charles M. Hannum. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kern_ipc_10.c,v 1.21 2007/06/17 10:24:21 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_ipc_10.c,v 1.22 2007/12/08 18:35:54 dsl Exp $"); #include "opt_sysv.h" @@ -50,10 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: kern_ipc_10.c,v 1.21 2007/06/17 10:24:21 dsl Exp $") #if defined(SYSVSEM) && !defined(_LP64) int -compat_10_sys_semsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_10_sys_semsys(struct lwp *l, void *v, register_t *retval) { struct compat_10_sys_semsys_args /* { syscallarg(int) which; @@ -130,10 +127,7 @@ compat_10_sys_semsys(l, v, retval) #if defined(SYSVSHM) && !defined(_LP64) int -compat_10_sys_shmsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_10_sys_shmsys(struct lwp *l, void *v, register_t *retval) { struct compat_10_sys_shmsys_args /* { syscallarg(int) which; @@ -194,10 +188,7 @@ compat_10_sys_shmsys(l, v, retval) #if defined(SYSVMSG) && !defined(_LP64) int -compat_10_sys_msgsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_10_sys_msgsys(struct lwp *l, void *v, register_t *retval) { struct compat_10_sys_msgsys_args /* { syscallarg(int) which; diff --git a/sys/compat/common/kern_sig_13.c b/sys/compat/common/kern_sig_13.c index a8ee9bacc6a..ff3885c6111 100644 --- a/sys/compat/common/kern_sig_13.c +++ b/sys/compat/common/kern_sig_13.c @@ -1,4 +1,4 @@ -/* $NetBSD: kern_sig_13.c,v 1.15 2007/06/16 20:04:28 dsl Exp $ */ +/* $NetBSD: kern_sig_13.c,v 1.16 2007/12/08 18:35:54 dsl Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kern_sig_13.c,v 1.15 2007/06/16 20:04:28 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_sig_13.c,v 1.16 2007/12/08 18:35:54 dsl Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -56,9 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: kern_sig_13.c,v 1.15 2007/06/16 20:04:28 dsl Exp $") #include <compat/common/compat_sigaltstack.h> void -native_sigset13_to_sigset(oss, ss) - const sigset13_t *oss; - sigset_t *ss; +native_sigset13_to_sigset(const sigset13_t *oss, sigset_t *ss) { ss->__bits[0] = *oss; @@ -68,18 +66,14 @@ native_sigset13_to_sigset(oss, ss) } void -native_sigset_to_sigset13(ss, oss) - const sigset_t *ss; - sigset13_t *oss; +native_sigset_to_sigset13(const sigset_t *ss, sigset13_t *oss) { *oss = ss->__bits[0]; } void -native_sigaction13_to_sigaction(osa, sa) - const struct sigaction13 *osa; - struct sigaction *sa; +native_sigaction13_to_sigaction(const struct sigaction13 *osa, struct sigaction *sa) { sa->sa_handler = osa->osa_handler; @@ -88,9 +82,7 @@ native_sigaction13_to_sigaction(osa, sa) } void -native_sigaction_to_sigaction13(sa, osa) - const struct sigaction *sa; - struct sigaction13 *osa; +native_sigaction_to_sigaction13(const struct sigaction *sa, struct sigaction13 *osa) { osa->osa_handler = sa->sa_handler; diff --git a/sys/compat/common/kern_sig_43.c b/sys/compat/common/kern_sig_43.c index 9950a61e006..3b8e966bdd4 100644 --- a/sys/compat/common/kern_sig_43.c +++ b/sys/compat/common/kern_sig_43.c @@ -1,4 +1,4 @@ -/* $NetBSD: kern_sig_43.c,v 1.28 2007/12/04 18:40:07 dsl Exp $ */ +/* $NetBSD: kern_sig_43.c,v 1.29 2007/12/08 18:35:54 dsl Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kern_sig_43.c,v 1.28 2007/12/04 18:40:07 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_sig_43.c,v 1.29 2007/12/08 18:35:54 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -80,9 +80,7 @@ void compat_43_sigstack_to_sigaltstack(const struct sigstack *, struct sigaltsta void compat_43_sigaltstack_to_sigstack(const struct sigaltstack *, struct sigstack *); void -compat_43_sigmask_to_sigset(sm, ss) - const int *sm; - sigset_t *ss; +compat_43_sigmask_to_sigset(const int *sm, sigset_t *ss) { ss->__bits[0] = *sm; @@ -92,18 +90,14 @@ compat_43_sigmask_to_sigset(sm, ss) } void -compat_43_sigset_to_sigmask(ss, sm) - const sigset_t *ss; - int *sm; +compat_43_sigset_to_sigmask(const sigset_t *ss, int *sm) { *sm = ss->__bits[0]; } void -compat_43_sigvec_to_sigaction(sv, sa) - const struct sigvec *sv; - struct sigaction *sa; +compat_43_sigvec_to_sigaction(const struct sigvec *sv, struct sigaction *sa) { sa->sa_handler = sv->sv_handler; compat_43_sigmask_to_sigset(&sv->sv_mask, &sa->sa_mask); @@ -111,9 +105,7 @@ compat_43_sigvec_to_sigaction(sv, sa) } void -compat_43_sigaction_to_sigvec(sa, sv) - const struct sigaction *sa; - struct sigvec *sv; +compat_43_sigaction_to_sigvec(const struct sigaction *sa, struct sigvec *sv) { sv->sv_handler = sa->sa_handler; compat_43_sigset_to_sigmask(&sa->sa_mask, &sv->sv_mask); @@ -121,9 +113,7 @@ compat_43_sigaction_to_sigvec(sa, sv) } void -compat_43_sigstack_to_sigaltstack(ss, sa) - const struct sigstack *ss; - struct sigaltstack *sa; +compat_43_sigstack_to_sigaltstack(const struct sigstack *ss, struct sigaltstack *sa) { sa->ss_sp = ss->ss_sp; sa->ss_size = SIGSTKSZ; /* Use the recommended size */ @@ -133,9 +123,7 @@ compat_43_sigstack_to_sigaltstack(ss, sa) } void -compat_43_sigaltstack_to_sigstack(sa, ss) - const struct sigaltstack *sa; - struct sigstack *ss; +compat_43_sigaltstack_to_sigstack(const struct sigaltstack *sa, struct sigstack *ss) { ss->ss_sp = sa->ss_sp; if (sa->ss_flags & SS_ONSTACK) diff --git a/sys/compat/common/sysv_ipc_14.c b/sys/compat/common/sysv_ipc_14.c index edcac81483b..394ea7ac3e2 100644 --- a/sys/compat/common/sysv_ipc_14.c +++ b/sys/compat/common/sysv_ipc_14.c @@ -1,4 +1,4 @@ -/* $NetBSD: sysv_ipc_14.c,v 1.3 2005/11/11 17:10:42 christos Exp $ */ +/* $NetBSD: sysv_ipc_14.c,v 1.4 2007/12/08 18:35:54 dsl Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -38,16 +38,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sysv_ipc_14.c,v 1.3 2005/11/11 17:10:42 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sysv_ipc_14.c,v 1.4 2007/12/08 18:35:54 dsl Exp $"); #include <sys/types.h> #include <sys/ipc.h> #include <compat/sys/ipc.h> void -ipc_perm14_to_native(operm, perm) - struct ipc_perm14 *operm; - struct ipc_perm *perm; +ipc_perm14_to_native(struct ipc_perm14 *operm, struct ipc_perm *perm) { #define CVT(x) perm->x = operm->x @@ -60,9 +58,7 @@ ipc_perm14_to_native(operm, perm) } void -native_to_ipc_perm14(perm, operm) - struct ipc_perm *perm; - struct ipc_perm14 *operm; +native_to_ipc_perm14(struct ipc_perm *perm, struct ipc_perm14 *operm) { #define CVT(x) operm->x = perm->x diff --git a/sys/compat/common/sysv_msg_14.c b/sys/compat/common/sysv_msg_14.c index a214e530d2b..158dffa5dd2 100644 --- a/sys/compat/common/sysv_msg_14.c +++ b/sys/compat/common/sysv_msg_14.c @@ -1,4 +1,4 @@ -/* $NetBSD: sysv_msg_14.c,v 1.14 2007/12/04 18:40:07 dsl Exp $ */ +/* $NetBSD: sysv_msg_14.c,v 1.15 2007/12/08 18:35:54 dsl Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sysv_msg_14.c,v 1.14 2007/12/04 18:40:07 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sysv_msg_14.c,v 1.15 2007/12/08 18:35:54 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -59,9 +59,7 @@ static void msqid_ds14_to_native(struct msqid_ds14 *, struct msqid_ds *); static void native_to_msqid_ds14(struct msqid_ds *, struct msqid_ds14 *); static void -msqid_ds14_to_native(omsqbuf, msqbuf) - struct msqid_ds14 *omsqbuf; - struct msqid_ds *msqbuf; +msqid_ds14_to_native(struct msqid_ds14 *omsqbuf, struct msqid_ds *msqbuf) { ipc_perm14_to_native(&omsqbuf->msg_perm, &msqbuf->msg_perm); @@ -78,9 +76,7 @@ msqid_ds14_to_native(omsqbuf, msqbuf) } static void -native_to_msqid_ds14(msqbuf, omsqbuf) - struct msqid_ds *msqbuf; - struct msqid_ds14 *omsqbuf; +native_to_msqid_ds14(struct msqid_ds *msqbuf, struct msqid_ds14 *omsqbuf) { native_to_ipc_perm14(&msqbuf->msg_perm, &omsqbuf->msg_perm); diff --git a/sys/compat/common/sysv_shm_14.c b/sys/compat/common/sysv_shm_14.c index 7acca9e65b2..83f720ddb70 100644 --- a/sys/compat/common/sysv_shm_14.c +++ b/sys/compat/common/sysv_shm_14.c @@ -1,4 +1,4 @@ -/* $NetBSD: sysv_shm_14.c,v 1.12 2007/12/04 18:40:07 dsl Exp $ */ +/* $NetBSD: sysv_shm_14.c,v 1.13 2007/12/08 18:35:55 dsl Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sysv_shm_14.c,v 1.12 2007/12/04 18:40:07 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sysv_shm_14.c,v 1.13 2007/12/08 18:35:55 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -59,9 +59,7 @@ static void shmid_ds14_to_native(struct shmid_ds14 *, struct shmid_ds *); static void native_to_shmid_ds14(struct shmid_ds *, struct shmid_ds14 *); static void -shmid_ds14_to_native(oshmbuf, shmbuf) - struct shmid_ds14 *oshmbuf; - struct shmid_ds *shmbuf; +shmid_ds14_to_native(struct shmid_ds14 *oshmbuf, struct shmid_ds *shmbuf) { ipc_perm14_to_native(&oshmbuf->shm_perm, &shmbuf->shm_perm); @@ -78,9 +76,7 @@ shmid_ds14_to_native(oshmbuf, shmbuf) } static void -native_to_shmid_ds14(shmbuf, oshmbuf) - struct shmid_ds *shmbuf; - struct shmid_ds14 *oshmbuf; +native_to_shmid_ds14(struct shmid_ds *shmbuf, struct shmid_ds14 *oshmbuf) { native_to_ipc_perm14(&shmbuf->shm_perm, &oshmbuf->shm_perm); diff --git a/sys/compat/common/tty_43.c b/sys/compat/common/tty_43.c index 55dc58f48d8..daca84bd4b9 100644 --- a/sys/compat/common/tty_43.c +++ b/sys/compat/common/tty_43.c @@ -1,4 +1,4 @@ -/* $NetBSD: tty_43.c,v 1.23 2007/12/04 18:40:07 dsl Exp $ */ +/* $NetBSD: tty_43.c,v 1.24 2007/12/08 18:35:55 dsl Exp $ */ /*- * Copyright (c) 1982, 1986, 1991, 1993 @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tty_43.c,v 1.23 2007/12/04 18:40:07 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tty_43.c,v 1.24 2007/12/08 18:35:55 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -90,12 +90,7 @@ void ttcompatsetlflags(struct tty *, struct termios *); /*ARGSUSED*/ int -ttcompat(tp, com, data, flag, l) - struct tty *tp; - u_long com; - void *data; - int flag; - struct lwp *l; +ttcompat(struct tty *tp, u_long com, void *data, int flag, struct lwp *l) { switch (com) { @@ -257,8 +252,7 @@ ttcompat(tp, com, data, flag, l) } int -ttcompatgetflags(tp) - struct tty *tp; +ttcompatgetflags(struct tty *tp) { tcflag_t iflag = tp->t_iflag; tcflag_t lflag = tp->t_lflag; @@ -321,9 +315,7 @@ ttcompatgetflags(tp) } void -ttcompatsetflags(tp, t) - struct tty *tp; - struct termios *t; +ttcompatsetflags(struct tty *tp, struct termios *t) { int flags = tp->t_flags; tcflag_t iflag = t->c_iflag; @@ -409,9 +401,7 @@ ttcompatsetflags(tp, t) } void -ttcompatsetlflags(tp, t) - struct tty *tp; - struct termios *t; +ttcompatsetlflags(struct tty *tp, struct termios *t) { int flags = tp->t_flags; tcflag_t iflag = t->c_iflag; diff --git a/sys/compat/common/uipc_syscalls_43.c b/sys/compat/common/uipc_syscalls_43.c index 470a9e7f4ac..fb8f497b02f 100644 --- a/sys/compat/common/uipc_syscalls_43.c +++ b/sys/compat/common/uipc_syscalls_43.c @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_syscalls_43.c,v 1.37 2007/09/11 19:59:18 gdt Exp $ */ +/* $NetBSD: uipc_syscalls_43.c,v 1.38 2007/12/08 18:35:55 dsl Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1990, 1993 @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_43.c,v 1.37 2007/09/11 19:59:18 gdt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_43.c,v 1.38 2007/12/08 18:35:55 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -371,8 +371,7 @@ compat_43_sys_sendmsg(struct lwp *l, void *v, register_t *retval) } static int -compat_43_sa_put(from) - void *from; +compat_43_sa_put(void *from) { struct osockaddr *osa = (struct osockaddr *) from; struct sockaddr sa; diff --git a/sys/compat/common/vfs_syscalls_20.c b/sys/compat/common/vfs_syscalls_20.c index fcb82184492..0c17f962b39 100644 --- a/sys/compat/common/vfs_syscalls_20.c +++ b/sys/compat/common/vfs_syscalls_20.c @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_syscalls_20.c,v 1.20 2007/11/26 19:01:29 pooka Exp $ */ +/* $NetBSD: vfs_syscalls_20.c,v 1.21 2007/12/08 18:35:55 dsl Exp $ */ /* * Copyright (c) 1989, 1993 @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_20.c,v 1.20 2007/11/26 19:01:29 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_20.c,v 1.21 2007/12/08 18:35:55 dsl Exp $"); #include "opt_compat_netbsd.h" #include "opt_compat_43.h" @@ -201,10 +201,7 @@ compat_20_sys_fstatfs(struct lwp *l, void *v, register_t *retval) * Get statistics on all filesystems. */ int -compat_20_sys_getfsstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_20_sys_getfsstat(struct lwp *l, void *v, register_t *retval) { struct compat_20_sys_getfsstat_args /* { syscallarg(struct statfs12 *) buf; diff --git a/sys/compat/common/vfs_syscalls_43.c b/sys/compat/common/vfs_syscalls_43.c index 14274f5cbfc..852792ee62d 100644 --- a/sys/compat/common/vfs_syscalls_43.c +++ b/sys/compat/common/vfs_syscalls_43.c @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_syscalls_43.c,v 1.42 2007/12/04 18:40:08 dsl Exp $ */ +/* $NetBSD: vfs_syscalls_43.c,v 1.43 2007/12/08 18:35:55 dsl Exp $ */ /* * Copyright (c) 1989, 1993 @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_43.c,v 1.42 2007/12/04 18:40:08 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_43.c,v 1.43 2007/12/08 18:35:55 dsl Exp $"); #if defined(_KERNEL_OPT) #include "fs_union.h" @@ -76,9 +76,7 @@ static void cvtstat(struct stat *, struct stat43 *); * Convert from an old to a new stat structure. */ static void -cvtstat(st, ost) - struct stat *st; - struct stat43 *ost; +cvtstat(struct stat *st, struct stat43 *ost) { ost->st_dev = st->st_dev; diff --git a/sys/compat/darwin/darwin_attr.c b/sys/compat/darwin/darwin_attr.c index 466d7250a08..7c634661d19 100644 --- a/sys/compat/darwin/darwin_attr.c +++ b/sys/compat/darwin/darwin_attr.c @@ -1,4 +1,4 @@ -/* $NetBSD: darwin_attr.c,v 1.19 2007/11/26 19:01:29 pooka Exp $ */ +/* $NetBSD: darwin_attr.c,v 1.20 2007/12/08 18:35:55 dsl Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: darwin_attr.c,v 1.19 2007/11/26 19:01:29 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: darwin_attr.c,v 1.20 2007/12/08 18:35:55 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -76,11 +76,7 @@ static int darwin_attr_append(const char *, size_t, char **, size_t *); static int -darwin_attr_append(x, size, bp, len) - const char *x; - size_t size; - char **bp; - size_t *len; +darwin_attr_append(const char *x, size_t size, char **bp, size_t *len) { if (*len < size) return -1; @@ -94,10 +90,7 @@ darwin_attr_append(x, size, bp, len) } int -darwin_sys_getattrlist(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +darwin_sys_getattrlist(struct lwp *l, void *v, register_t *retval) { struct darwin_sys_getattrlist_args /* { syscallarg(const char *) path; diff --git a/sys/compat/darwin/darwin_commpage.c b/sys/compat/darwin/darwin_commpage.c index daf74e61967..88460ab3fd5 100644 --- a/sys/compat/darwin/darwin_commpage.c +++ b/sys/compat/darwin/darwin_commpage.c @@ -1,4 +1,4 @@ -/* $NetBSD: darwin_commpage.c,v 1.12 2007/10/19 12:16:36 ad Exp $ */ +/* $NetBSD: darwin_commpage.c,v 1.13 2007/12/08 18:35:55 dsl Exp $ */ /*- * Copyright (c) 2004 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: darwin_commpage.c,v 1.12 2007/10/19 12:16:36 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: darwin_commpage.c,v 1.13 2007/12/08 18:35:55 dsl Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -73,8 +73,7 @@ static struct uvm_object *darwin_commpage_uao = NULL; static void darwin_commpage_init(struct darwin_commpage *); int -darwin_commpage_map(p) - struct proc *p; +darwin_commpage_map(struct proc *p) { int error; vaddr_t kvaddr; @@ -147,8 +146,7 @@ darwin_commpage_map(p) } void -darwin_commpage_init(dcp) - struct darwin_commpage *dcp; +darwin_commpage_init(struct darwin_commpage *dcp) { /* * XXX Only one page is mapped yet (see higher in the file) diff --git a/sys/compat/darwin/darwin_exec.c b/sys/compat/darwin/darwin_exec.c index 09cbcdd95b1..6217169b178 100644 --- a/sys/compat/darwin/darwin_exec.c +++ b/sys/compat/darwin/darwin_exec.c @@ -1,4 +1,4 @@ -/* $NetBSD: darwin_exec.c,v 1.51 2007/07/01 20:14:17 dsl Exp $ */ +/* $NetBSD: darwin_exec.c,v 1.52 2007/12/08 18:35:56 dsl Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ #include "opt_compat_darwin.h" /* For COMPAT_DARWIN in mach_port.h */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: darwin_exec.c,v 1.51 2007/07/01 20:14:17 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: darwin_exec.c,v 1.52 2007/12/08 18:35:56 dsl Exp $"); #include "opt_syscall_debug.h" @@ -140,12 +140,7 @@ const struct emul emul_darwin = { * extra information in case of dynamic binding. */ int -exec_darwin_copyargs(l, pack, arginfo, stackp, argp) - struct lwp *l; - struct exec_package *pack; - struct ps_strings *arginfo; - char **stackp; - void *argp; +exec_darwin_copyargs(struct lwp *l, struct exec_package *pack, struct ps_strings *arginfo, char **stackp, void *argp) { struct exec_macho_emul_arg *emea; struct exec_macho_object_header *macho_hdr; @@ -226,17 +221,14 @@ exec_darwin_copyargs(l, pack, arginfo, stackp, argp) } int -exec_darwin_probe(path) - const char **path; +exec_darwin_probe(const char **path) { *path = emul_darwin.e_path; return 0; } static void -darwin_e_proc_exec(p, epp) - struct proc *p; - struct exec_package *epp; +darwin_e_proc_exec(struct proc *p, struct exec_package *epp) { struct darwin_emuldata *ded; @@ -298,9 +290,7 @@ darwin_e_proc_fork(struct proc *p, struct proc *parent, int forkflags) } static void -darwin_e_proc_init(p, vmspace) - struct proc *p; - struct vmspace *vmspace; +darwin_e_proc_init(struct proc *p, struct vmspace *vmspace) { struct darwin_emuldata *ded; @@ -321,8 +311,7 @@ darwin_e_proc_init(p, vmspace) } static void -darwin_e_proc_exit(p) - struct proc *p; +darwin_e_proc_exit(struct proc *p) { struct darwin_emuldata *ded; int error, mode; @@ -412,9 +401,7 @@ darwin_e_proc_exit(p) } int -darwin_exec_setup_stack(l, epp) - struct lwp *l; - struct exec_package *epp; +darwin_exec_setup_stack(struct lwp *l, struct exec_package *epp) { u_long max_stack_size; u_long access_linear_min, access_size; diff --git a/sys/compat/darwin/darwin_ioctl.c b/sys/compat/darwin/darwin_ioctl.c index 21e0829019e..7c34e9ca47d 100644 --- a/sys/compat/darwin/darwin_ioctl.c +++ b/sys/compat/darwin/darwin_ioctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: darwin_ioctl.c,v 1.6 2007/02/09 21:55:16 ad Exp $ */ +/* $NetBSD: darwin_ioctl.c,v 1.7 2007/12/08 18:35:56 dsl Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: darwin_ioctl.c,v 1.6 2007/02/09 21:55:16 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: darwin_ioctl.c,v 1.7 2007/12/08 18:35:56 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -63,10 +63,7 @@ __KERNEL_RCSID(0, "$NetBSD: darwin_ioctl.c,v 1.6 2007/02/09 21:55:16 ad Exp $"); static int vtype_to_dtype(int); int -darwin_sys_ioctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +darwin_sys_ioctl(struct lwp *l, void *v, register_t *retval) { struct darwin_sys_ioctl_args /* { syscallarg(int) fd; @@ -113,8 +110,7 @@ darwin_sys_ioctl(l, v, retval) } static int -vtype_to_dtype(dtype) - int dtype; +vtype_to_dtype(int dtype) { switch (dtype) { case VNON: diff --git a/sys/compat/darwin/darwin_ioframebuffer.c b/sys/compat/darwin/darwin_ioframebuffer.c index 52d6cf811a6..0b8a5a977f7 100644 --- a/sys/compat/darwin/darwin_ioframebuffer.c +++ b/sys/compat/darwin/darwin_ioframebuffer.c @@ -1,4 +1,4 @@ -/* $NetBSD: darwin_ioframebuffer.c,v 1.38 2007/07/01 20:14:17 dsl Exp $ */ +/* $NetBSD: darwin_ioframebuffer.c,v 1.39 2007/12/08 18:35:56 dsl Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: darwin_ioframebuffer.c,v 1.38 2007/07/01 20:14:17 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: darwin_ioframebuffer.c,v 1.39 2007/12/08 18:35:56 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -123,8 +123,7 @@ struct mach_iokit_devclass darwin_ioframebuffer_devclass = { }; int -darwin_ioframebuffer_connect_method_scalari_scalaro(args) - struct mach_trap_args *args; +darwin_ioframebuffer_connect_method_scalari_scalaro(struct mach_trap_args *args) { mach_io_connect_method_scalari_scalaro_request_t *req = args->smsg; mach_io_connect_method_scalari_scalaro_reply_t *rep = args->rmsg; @@ -301,8 +300,7 @@ darwin_ioframebuffer_connect_method_scalari_scalaro(args) } int -darwin_ioframebuffer_connect_method_scalari_structo(args) - struct mach_trap_args *args; +darwin_ioframebuffer_connect_method_scalari_structo(struct mach_trap_args *args) { mach_io_connect_method_scalari_structo_request_t *req = args->smsg; mach_io_connect_method_scalari_structo_reply_t *rep = args->rmsg; @@ -419,8 +417,7 @@ darwin_ioframebuffer_connect_method_scalari_structo(args) } int -darwin_ioframebuffer_connect_method_structi_structo(args) - struct mach_trap_args *args; +darwin_ioframebuffer_connect_method_structi_structo(struct mach_trap_args *args) { mach_io_connect_method_structi_structo_request_t *req = args->smsg; mach_io_connect_method_structi_structo_reply_t *rep = args->rmsg; @@ -465,8 +462,7 @@ darwin_ioframebuffer_connect_method_structi_structo(args) } int -darwin_ioframebuffer_connect_map_memory(args) - struct mach_trap_args *args; +darwin_ioframebuffer_connect_map_memory(struct mach_trap_args *args) { mach_io_connect_map_memory_request_t *req = args->smsg; mach_io_connect_map_memory_reply_t *rep = args->rmsg; @@ -625,8 +621,7 @@ darwin_ioframebuffer_connect_map_memory(args) } void -darwin_ioframebuffer_shmeminit(kvaddr) - vaddr_t kvaddr; +darwin_ioframebuffer_shmeminit(vaddr_t kvaddr) { struct darwin_ioframebuffer_shmem *shmem; @@ -636,8 +631,7 @@ darwin_ioframebuffer_shmeminit(kvaddr) } int -darwin_ioframebuffer_connect_method_scalari_structi(args) - struct mach_trap_args *args; +darwin_ioframebuffer_connect_method_scalari_structi(struct mach_trap_args *args) { mach_io_connect_method_scalari_structi_request_t *req = args->smsg; mach_io_connect_method_scalari_structi_reply_t *rep = args->rmsg; diff --git a/sys/compat/darwin/darwin_iohidsystem.c b/sys/compat/darwin/darwin_iohidsystem.c index e24a00ed17b..927813d63d6 100644 --- a/sys/compat/darwin/darwin_iohidsystem.c +++ b/sys/compat/darwin/darwin_iohidsystem.c @@ -1,4 +1,4 @@ -/* $NetBSD: darwin_iohidsystem.c,v 1.40 2007/08/15 12:07:27 ad Exp $ */ +/* $NetBSD: darwin_iohidsystem.c,v 1.41 2007/12/08 18:35:56 dsl Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: darwin_iohidsystem.c,v 1.40 2007/08/15 12:07:27 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: darwin_iohidsystem.c,v 1.41 2007/12/08 18:35:56 dsl Exp $"); #include "ioconf.h" #include "wsmux.h" @@ -158,8 +158,7 @@ struct mach_iokit_devclass darwin_iohidsystem_devclass = { }; int -darwin_iohidsystem_connect_method_scalari_scalaro(args) - struct mach_trap_args *args; +darwin_iohidsystem_connect_method_scalari_scalaro(struct mach_trap_args *args) { mach_io_connect_method_scalari_scalaro_request_t *req = args->smsg; mach_io_connect_method_scalari_scalaro_reply_t *rep = args->rmsg; @@ -300,8 +299,7 @@ darwin_iohidsystem_connect_method_scalari_scalaro(args) } int -darwin_iohidsystem_connect_method_structi_structo(args) - struct mach_trap_args *args; +darwin_iohidsystem_connect_method_structi_structo(struct mach_trap_args *args) { mach_io_connect_method_structi_structo_request_t *req = args->smsg; mach_io_connect_method_structi_structo_reply_t *rep = args->rmsg; @@ -366,8 +364,7 @@ darwin_iohidsystem_connect_method_structi_structo(args) } int -darwin_iohidsystem_connect_map_memory(args) - struct mach_trap_args *args; +darwin_iohidsystem_connect_map_memory(struct mach_trap_args *args) { mach_io_connect_map_memory_request_t *req = args->smsg; mach_io_connect_map_memory_reply_t *rep = args->rmsg; @@ -410,8 +407,7 @@ darwin_iohidsystem_connect_map_memory(args) } static void -darwin_iohidsystem_thread(args) - void *args; +darwin_iohidsystem_thread(void *args) { struct darwin_iohidsystem_thread_args *dita; struct darwin_iohidsystem_shmem *shmem; @@ -530,8 +526,7 @@ out2: }; static void -darwin_iohidsystem_shmeminit(kvaddr) - vaddr_t kvaddr; +darwin_iohidsystem_shmeminit(vaddr_t kvaddr) { struct darwin_iohidsystem_shmem *shmem; struct darwin_iohidsystem_evglobals *evglobals; @@ -555,9 +550,7 @@ darwin_iohidsystem_shmeminit(kvaddr) } static int -darwin_findwsmux(dev, mux) - dev_t *dev; - int mux; +darwin_findwsmux(dev_t *dev, int mux) { extern struct cdevsw wsmux_cdevsw; struct wsmux_softc *wsm_sc; @@ -574,9 +567,7 @@ darwin_findwsmux(dev, mux) } static void -darwin_wscons_to_iohidsystem(wsevt, hidevt) - struct wscons_event *wsevt; - darwin_iohidsystem_event *hidevt; +darwin_wscons_to_iohidsystem(struct wscons_event *wsevt, darwin_iohidsystem_event *hidevt) { struct timeval tv; static int px = 0; /* Previous mouse location */ @@ -726,8 +717,7 @@ mach_notify_iohidsystem(struct lwp *l, struct mach_right *mr) } void -darwin_iohidsystem_postfake(l) - struct lwp *l; +darwin_iohidsystem_postfake(struct lwp *l) { dev_t dev; int error; diff --git a/sys/compat/darwin/darwin_mman.c b/sys/compat/darwin/darwin_mman.c index 8e015d82bf9..7a9dabe6540 100644 --- a/sys/compat/darwin/darwin_mman.c +++ b/sys/compat/darwin/darwin_mman.c @@ -1,6 +1,6 @@ #undef DEBUG_DARWIN #undef DEBUG_MACH -/* $NetBSD: darwin_mman.c,v 1.23 2007/03/04 06:01:14 christos Exp $ */ +/* $NetBSD: darwin_mman.c,v 1.24 2007/12/08 18:35:56 dsl Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: darwin_mman.c,v 1.23 2007/03/04 06:01:14 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: darwin_mman.c,v 1.24 2007/12/08 18:35:56 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -67,10 +67,7 @@ __KERNEL_RCSID(0, "$NetBSD: darwin_mman.c,v 1.23 2007/03/04 06:01:14 christos Ex #include <compat/darwin/darwin_syscallargs.h> int -darwin_sys_load_shared_file(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +darwin_sys_load_shared_file(struct lwp *l, void *v, register_t *retval) { struct darwin_sys_load_shared_file_args /* { syscallarg(char *) filename; diff --git a/sys/compat/darwin/darwin_mount.c b/sys/compat/darwin/darwin_mount.c index 69cf1e29b8d..a6a66ac9257 100644 --- a/sys/compat/darwin/darwin_mount.c +++ b/sys/compat/darwin/darwin_mount.c @@ -1,4 +1,4 @@ -/* $NetBSD: darwin_mount.c,v 1.12 2007/11/26 19:01:29 pooka Exp $ */ +/* $NetBSD: darwin_mount.c,v 1.13 2007/12/08 18:35:56 dsl Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: darwin_mount.c,v 1.12 2007/11/26 19:01:29 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: darwin_mount.c,v 1.13 2007/12/08 18:35:56 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -96,10 +96,7 @@ out: } int -darwin_sys_getfsstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +darwin_sys_getfsstat(struct lwp *l, void *v, register_t *retval) { struct darwin_sys_getfsstat_args /* { syscallarg(struct darwin_statfs *) buf; @@ -177,9 +174,7 @@ darwin_sys_statfs(struct lwp *l, void *v, register_t *retval) static void -native_to_darwin_statvfs(bs, ds) - const struct statvfs *bs; - struct darwin_statfs *ds; +native_to_darwin_statvfs(const struct statvfs *bs, struct darwin_statfs *ds) { long dflags = 0; long sflags = bs->f_flag & MNT_VISFLAGMASK; diff --git a/sys/compat/darwin/darwin_ptrace.c b/sys/compat/darwin/darwin_ptrace.c index b2280472400..1cee5afdea8 100644 --- a/sys/compat/darwin/darwin_ptrace.c +++ b/sys/compat/darwin/darwin_ptrace.c @@ -1,4 +1,4 @@ -/* $NetBSD: darwin_ptrace.c,v 1.12 2007/03/04 06:01:14 christos Exp $ */ +/* $NetBSD: darwin_ptrace.c,v 1.13 2007/12/08 18:35:57 dsl Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: darwin_ptrace.c,v 1.12 2007/03/04 06:01:14 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: darwin_ptrace.c,v 1.13 2007/12/08 18:35:57 dsl Exp $"); #include "opt_ptrace.h" @@ -64,10 +64,7 @@ __KERNEL_RCSID(0, "$NetBSD: darwin_ptrace.c,v 1.12 2007/03/04 06:01:14 christos #define ISSET(t, f) ((t) & (f)) int -darwin_sys_ptrace(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +darwin_sys_ptrace(struct lwp *l, void *v, register_t *retval) { #if defined(PTRACE) || defined(_LKM) struct darwin_sys_ptrace_args /* { diff --git a/sys/compat/darwin/darwin_route.c b/sys/compat/darwin/darwin_route.c index 1753525fa66..3dd16a7b5ce 100644 --- a/sys/compat/darwin/darwin_route.c +++ b/sys/compat/darwin/darwin_route.c @@ -1,4 +1,4 @@ -/* $NetBSD: darwin_route.c,v 1.12 2007/06/24 18:07:34 dsl Exp $ */ +/* $NetBSD: darwin_route.c,v 1.13 2007/12/08 18:35:57 dsl Exp $ */ /*- * Copyright (c) 2004 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: darwin_route.c,v 1.12 2007/06/24 18:07:34 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: darwin_route.c,v 1.13 2007/12/08 18:35:57 dsl Exp $"); #include <sys/errno.h> #include <sys/systm.h> @@ -52,10 +52,7 @@ static int darwin_copyout_sockaddr(struct sockaddr *, char **, size_t *, size_t) #define ALIGN(a) (((a) + 3) & ~0x3UL) int -darwin_ifaddrs(af, dst, sizep) - int af; - char *dst; - size_t *sizep; +darwin_ifaddrs(int af, char *dst, size_t *sizep) { struct darwin_if_msghdr dim; struct ifnet *ifp; @@ -262,11 +259,7 @@ darwin_ifaddrs(af, dst, sizep) static int -darwin_copyout_sockaddr(sap, dstp, sizep, maxsize) - struct sockaddr *sap; - char **dstp; - size_t *sizep; - size_t maxsize; +darwin_copyout_sockaddr(struct sockaddr *sap, char **dstp, size_t *sizep, size_t maxsize) { size_t len; int error; diff --git a/sys/compat/darwin/darwin_signal.c b/sys/compat/darwin/darwin_signal.c index 03d57d8ecb3..155f7c53b7b 100644 --- a/sys/compat/darwin/darwin_signal.c +++ b/sys/compat/darwin/darwin_signal.c @@ -1,4 +1,4 @@ -/* $NetBSD: darwin_signal.c,v 1.26 2007/06/17 20:15:19 dsl Exp $ */ +/* $NetBSD: darwin_signal.c,v 1.27 2007/12/08 18:35:57 dsl Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: darwin_signal.c,v 1.26 2007/06/17 20:15:19 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: darwin_signal.c,v 1.27 2007/12/08 18:35:57 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -63,10 +63,7 @@ __KERNEL_RCSID(0, "$NetBSD: darwin_signal.c,v 1.26 2007/06/17 20:15:19 dsl Exp $ #include <compat/darwin/darwin_syscallargs.h> int -darwin_sys_sigaction(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +darwin_sys_sigaction(struct lwp *l, void *v, register_t *retval) { struct darwin_sys_sigaction_args /* { syscallarg(int) signum; @@ -107,9 +104,7 @@ darwin_sys_sigaction(l, v, retval) } void -darwin_trapsignal(l, ksi) - struct lwp *l; - struct ksiginfo *ksi; +darwin_trapsignal(struct lwp *l, struct ksiginfo *ksi) { if (mach_trapsignal1(l, ksi) != 0) trapsignal(l, ksi); @@ -118,9 +113,7 @@ darwin_trapsignal(l, ksi) } int -darwin_tracesig(p, signo) - struct proc *p; - int signo; +darwin_tracesig(struct proc *p, int signo) { struct darwin_emuldata *ded; struct lwp *l; @@ -146,10 +139,7 @@ darwin_tracesig(p, signo) } int -darwin_sys_sigprocmask(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +darwin_sys_sigprocmask(struct lwp *l, void *v, register_t *retval) { struct darwin_sys_sigprocmask_args /* { syscallarg(int) how; @@ -177,9 +167,7 @@ darwin_sys_sigprocmask(l, v, retval) } void -native_to_darwin_siginfo(ksi, dsi) - const struct ksiginfo *ksi; - struct darwin___siginfo *dsi; +native_to_darwin_siginfo(const struct ksiginfo *ksi, struct darwin___siginfo *dsi) { dsi->darwin_si_signo = ksi->ksi_signo; dsi->darwin_si_errno = ksi->ksi_errno; diff --git a/sys/compat/darwin/darwin_socket.c b/sys/compat/darwin/darwin_socket.c index 9d57c57ea1b..d637321d110 100644 --- a/sys/compat/darwin/darwin_socket.c +++ b/sys/compat/darwin/darwin_socket.c @@ -1,4 +1,4 @@ -/* $NetBSD: darwin_socket.c,v 1.15 2007/06/24 18:07:34 dsl Exp $ */ +/* $NetBSD: darwin_socket.c,v 1.16 2007/12/08 18:35:57 dsl Exp $ */ /*- * Copyright (c) 2004 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: darwin_socket.c,v 1.15 2007/06/24 18:07:34 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: darwin_socket.c,v 1.16 2007/12/08 18:35:57 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -180,10 +180,7 @@ darwin_to_native_sockaddr(struct mbuf *nam) } int -darwin_sys_socket(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +darwin_sys_socket(struct lwp *l, void *v, register_t *retval) { struct darwin_sys_socket_args /* { syscallarg(int) domain; @@ -203,10 +200,7 @@ darwin_sys_socket(l, v, retval) } int -darwin_sys_recvfrom(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +darwin_sys_recvfrom(struct lwp *l, void *v, register_t *retval) { struct darwin_sys_recvfrom_args /* { syscallarg(int) s; @@ -243,10 +237,7 @@ darwin_sys_recvfrom(l, v, retval) } int -darwin_sys_accept(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +darwin_sys_accept(struct lwp *l, void *v, register_t *retval) { struct darwin_sys_accept_args /* { syscallarg(int) s; @@ -272,10 +263,7 @@ darwin_sys_accept(l, v, retval) } int -darwin_sys_getpeername(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +darwin_sys_getpeername(struct lwp *l, void *v, register_t *retval) { struct darwin_sys_getpeername_args /* { syscallarg(int) fdes; @@ -299,10 +287,7 @@ darwin_sys_getpeername(l, v, retval) } int -darwin_sys_getsockname(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +darwin_sys_getsockname(struct lwp *l, void *v, register_t *retval) { struct darwin_sys_getsockname_args /* { syscallarg(int) fdes; @@ -326,10 +311,7 @@ darwin_sys_getsockname(l, v, retval) } int -darwin_sys_connect(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +darwin_sys_connect(struct lwp *l, void *v, register_t *retval) { struct darwin_sys_connect_args /* { syscallarg(int) s; @@ -350,10 +332,7 @@ darwin_sys_connect(l, v, retval) } int -darwin_sys_bind(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +darwin_sys_bind(struct lwp *l, void *v, register_t *retval) { struct darwin_sys_bind_args /* { syscallarg(int) s; @@ -374,10 +353,7 @@ darwin_sys_bind(l, v, retval) } int -darwin_sys_sendto(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +darwin_sys_sendto(struct lwp *l, void *v, register_t *retval) { struct darwin_sys_sendto_args /* { syscallarg(int) s; diff --git a/sys/compat/darwin/darwin_stat.c b/sys/compat/darwin/darwin_stat.c index 17627ad1009..dae8ebd429b 100644 --- a/sys/compat/darwin/darwin_stat.c +++ b/sys/compat/darwin/darwin_stat.c @@ -1,4 +1,4 @@ -/* $NetBSD: darwin_stat.c,v 1.9 2007/04/30 14:05:47 dsl Exp $ */ +/* $NetBSD: darwin_stat.c,v 1.10 2007/12/08 18:35:57 dsl Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: darwin_stat.c,v 1.9 2007/04/30 14:05:47 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: darwin_stat.c,v 1.10 2007/12/08 18:35:57 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -64,10 +64,7 @@ __KERNEL_RCSID(0, "$NetBSD: darwin_stat.c,v 1.9 2007/04/30 14:05:47 dsl Exp $"); #include <compat/darwin/darwin_syscallargs.h> int -darwin_sys_stat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +darwin_sys_stat(struct lwp *l, void *v, register_t *retval) { struct darwin_sys_stat_args /* { syscallarg(char *) path; @@ -89,10 +86,7 @@ darwin_sys_stat(l, v, retval) } int -darwin_sys_fstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +darwin_sys_fstat(struct lwp *l, void *v, register_t *retval) { struct darwin_sys_fstat_args /* { syscallarg(int) fd; @@ -114,10 +108,7 @@ darwin_sys_fstat(l, v, retval) } int -darwin_sys_lstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +darwin_sys_lstat(struct lwp *l, void *v, register_t *retval) { struct darwin_sys_lstat_args /* { syscallarg(char *) path; @@ -139,10 +130,7 @@ darwin_sys_lstat(l, v, retval) } int -darwin_sys_mknod(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +darwin_sys_mknod(struct lwp *l, void *v, register_t *retval) { struct darwin_sys_mknod_args /* { syscallarg(char) path; diff --git a/sys/compat/darwin/darwin_sysctl.c b/sys/compat/darwin/darwin_sysctl.c index 7acf47663bc..fa228cbaa8e 100644 --- a/sys/compat/darwin/darwin_sysctl.c +++ b/sys/compat/darwin/darwin_sysctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: darwin_sysctl.c,v 1.53 2007/08/15 12:07:28 ad Exp $ */ +/* $NetBSD: darwin_sysctl.c,v 1.54 2007/12/08 18:35:57 dsl Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: darwin_sysctl.c,v 1.53 2007/08/15 12:07:28 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: darwin_sysctl.c,v 1.54 2007/12/08 18:35:57 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -739,9 +739,7 @@ again: * Native struct proc to Darwin's struct kinfo_proc */ static void -darwin_fill_kproc(p, dkp) - struct proc *p; - struct darwin_kinfo_proc *dkp; +darwin_fill_kproc(struct proc *p, struct darwin_kinfo_proc *dkp) { struct lwp *l; struct darwin_extern_proc *dep; diff --git a/sys/compat/darwin/darwin_thread.c b/sys/compat/darwin/darwin_thread.c index e2f677f7a5b..dd05a6423af 100644 --- a/sys/compat/darwin/darwin_thread.c +++ b/sys/compat/darwin/darwin_thread.c @@ -1,4 +1,4 @@ -/* $NetBSD: darwin_thread.c,v 1.13 2007/02/09 21:55:16 ad Exp $ */ +/* $NetBSD: darwin_thread.c,v 1.14 2007/12/08 18:35:57 dsl Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: darwin_thread.c,v 1.13 2007/02/09 21:55:16 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: darwin_thread.c,v 1.14 2007/12/08 18:35:57 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -90,10 +90,7 @@ darwin_sys_vfork(struct lwp *l, void *v, register_t *retval) } int -darwin_sys_pthread_exit(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +darwin_sys_pthread_exit(struct lwp *l, void *v, register_t *retval) { struct darwin_sys_pthread_exit_args /* { syscallarg(void *) value_ptr; diff --git a/sys/compat/darwin/darwin_unistd.c b/sys/compat/darwin/darwin_unistd.c index b1460acbc8c..9d2e2495cf9 100644 --- a/sys/compat/darwin/darwin_unistd.c +++ b/sys/compat/darwin/darwin_unistd.c @@ -1,4 +1,4 @@ -/* $NetBSD: darwin_unistd.c,v 1.8 2007/02/09 21:55:16 ad Exp $ */ +/* $NetBSD: darwin_unistd.c,v 1.9 2007/12/08 18:35:57 dsl Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: darwin_unistd.c,v 1.8 2007/02/09 21:55:16 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: darwin_unistd.c,v 1.9 2007/12/08 18:35:57 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -55,10 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: darwin_unistd.c,v 1.8 2007/02/09 21:55:16 ad Exp $") #include <compat/darwin/darwin_syscallargs.h> int -darwin_sys_lseek(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +darwin_sys_lseek(struct lwp *l, void *v, register_t *retval) { struct darwin_sys_lseek_args *uap = v; struct sys_lseek_args cup; diff --git a/sys/compat/freebsd/freebsd_exec_aout.c b/sys/compat/freebsd/freebsd_exec_aout.c index 108741d8d2b..bae621f2a8e 100644 --- a/sys/compat/freebsd/freebsd_exec_aout.c +++ b/sys/compat/freebsd/freebsd_exec_aout.c @@ -1,4 +1,4 @@ -/* $NetBSD: freebsd_exec_aout.c,v 1.7 2005/12/11 12:20:02 christos Exp $ */ +/* $NetBSD: freebsd_exec_aout.c,v 1.8 2007/12/08 18:35:58 dsl Exp $ */ /* * Copyright (c) 1993, 1994 Christopher G. Demetriou @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: freebsd_exec_aout.c,v 1.7 2005/12/11 12:20:02 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: freebsd_exec_aout.c,v 1.8 2007/12/08 18:35:58 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -57,9 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: freebsd_exec_aout.c,v 1.7 2005/12/11 12:20:02 christ */ int -exec_freebsd_aout_makecmds(l, epp) - struct lwp *l; - struct exec_package *epp; +exec_freebsd_aout_makecmds(struct lwp *l, struct exec_package *epp) { u_long midmag; int error = ENOEXEC; diff --git a/sys/compat/freebsd/freebsd_file.c b/sys/compat/freebsd/freebsd_file.c index 671f9f65bdf..128f97bed26 100644 --- a/sys/compat/freebsd/freebsd_file.c +++ b/sys/compat/freebsd/freebsd_file.c @@ -1,4 +1,4 @@ -/* $NetBSD: freebsd_file.c,v 1.29 2007/12/04 18:40:08 dsl Exp $ */ +/* $NetBSD: freebsd_file.c,v 1.30 2007/12/08 18:35:58 dsl Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: freebsd_file.c,v 1.29 2007/12/04 18:40:08 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: freebsd_file.c,v 1.30 2007/12/08 18:35:58 dsl Exp $"); #if defined(_KERNEL_OPT) #include "fs_nfs.h" @@ -63,8 +63,7 @@ __KERNEL_RCSID(0, "$NetBSD: freebsd_file.c,v 1.29 2007/12/04 18:40:08 dsl Exp $" static const char * convert_from_freebsd_mount_type(int); static const char * -convert_from_freebsd_mount_type(type) - int type; +convert_from_freebsd_mount_type(int type) { static const char * const netbsd_mount_type[] = { NULL, /* 0 = MOUNT_NONE */ @@ -95,10 +94,7 @@ convert_from_freebsd_mount_type(type) } int -freebsd_sys_mount(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +freebsd_sys_mount(struct lwp *l, void *v, register_t *retval) { struct freebsd_sys_mount_args /* { syscallarg(int) type; diff --git a/sys/compat/freebsd/freebsd_ioctl.c b/sys/compat/freebsd/freebsd_ioctl.c index 9b6ec197f15..7b237093616 100644 --- a/sys/compat/freebsd/freebsd_ioctl.c +++ b/sys/compat/freebsd/freebsd_ioctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: freebsd_ioctl.c,v 1.13 2007/05/29 21:32:27 christos Exp $ */ +/* $NetBSD: freebsd_ioctl.c,v 1.14 2007/12/08 18:35:58 dsl Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: freebsd_ioctl.c,v 1.13 2007/05/29 21:32:27 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: freebsd_ioctl.c,v 1.14 2007/12/08 18:35:58 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -58,9 +58,7 @@ static void freebsd_to_oss(struct freebsd_sys_ioctl_args *, struct oss_sys_ioctl_args *); static void -freebsd_to_oss(uap, rap) -struct freebsd_sys_ioctl_args *uap; -struct oss_sys_ioctl_args *rap; +freebsd_to_oss(struct freebsd_sys_ioctl_args *uap, struct oss_sys_ioctl_args *rap) { u_long ocmd, ncmd; @@ -82,9 +80,7 @@ static void freebsd_to_netbsd_ifioctl(struct freebsd_sys_ioctl_args *uap, struct sys_ioctl_args *nap); static void -freebsd_to_netbsd_ifioctl(uap, nap) - struct freebsd_sys_ioctl_args *uap; - struct sys_ioctl_args *nap; +freebsd_to_netbsd_ifioctl(struct freebsd_sys_ioctl_args *uap, struct sys_ioctl_args *nap) { u_long ocmd, ncmd; ocmd = SCARG(uap, com); @@ -114,10 +110,7 @@ freebsd_to_netbsd_ifioctl(uap, nap) } int -freebsd_sys_ioctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +freebsd_sys_ioctl(struct lwp *l, void *v, register_t *retval) { struct freebsd_sys_ioctl_args /* { syscallarg(int) fd; diff --git a/sys/compat/freebsd/freebsd_ipc.c b/sys/compat/freebsd/freebsd_ipc.c index 2217c685dca..fcbf930e2f4 100644 --- a/sys/compat/freebsd/freebsd_ipc.c +++ b/sys/compat/freebsd/freebsd_ipc.c @@ -1,4 +1,4 @@ -/* $NetBSD: freebsd_ipc.c,v 1.13 2007/02/09 21:55:16 ad Exp $ */ +/* $NetBSD: freebsd_ipc.c,v 1.14 2007/12/08 18:35:58 dsl Exp $ */ /* * Copyright (c) 1994 Adam Glass and Charles M. Hannum. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: freebsd_ipc.c,v 1.13 2007/02/09 21:55:16 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: freebsd_ipc.c,v 1.14 2007/12/08 18:35:58 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_sysv.h" @@ -52,10 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: freebsd_ipc.c,v 1.13 2007/02/09 21:55:16 ad Exp $"); #ifdef SYSVSEM int -freebsd_sys_semsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +freebsd_sys_semsys(struct lwp *l, void *v, register_t *retval) { struct freebsd_sys_semsys_args /* { syscallarg(int) which; @@ -116,10 +113,7 @@ freebsd_sys_semsys(l, v, retval) #ifdef SYSVSHM int -freebsd_sys_shmsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +freebsd_sys_shmsys(struct lwp *l, void *v, register_t *retval) { struct freebsd_sys_shmsys_args /* { syscallarg(int) which; @@ -181,10 +175,7 @@ freebsd_sys_shmsys(l, v, retval) #ifdef SYSVMSG int -freebsd_sys_msgsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +freebsd_sys_msgsys(struct lwp *l, void *v, register_t *retval) { struct freebsd_sys_msgsys_args /* { syscallarg(int) which; diff --git a/sys/compat/freebsd/freebsd_misc.c b/sys/compat/freebsd/freebsd_misc.c index 4c666627f91..4ca527fbdad 100644 --- a/sys/compat/freebsd/freebsd_misc.c +++ b/sys/compat/freebsd/freebsd_misc.c @@ -1,4 +1,4 @@ -/* $NetBSD: freebsd_misc.c,v 1.30 2007/08/15 12:07:28 ad Exp $ */ +/* $NetBSD: freebsd_misc.c,v 1.31 2007/12/08 18:35:58 dsl Exp $ */ /* * Copyright (c) 1995 Frank van der Linden @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: freebsd_misc.c,v 1.30 2007/08/15 12:07:28 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: freebsd_misc.c,v 1.31 2007/12/08 18:35:58 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_ntp.h" @@ -62,10 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: freebsd_misc.c,v 1.30 2007/08/15 12:07:28 ad Exp $") #include <compat/freebsd/freebsd_mman.h> int -freebsd_sys_msync(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +freebsd_sys_msync(struct lwp *l, void *v, register_t *retval) { struct freebsd_sys_msync_args /* { syscallarg(void *) addr; @@ -86,10 +83,7 @@ freebsd_sys_msync(l, v, retval) } int -freebsd_sys_mmap(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +freebsd_sys_mmap(struct lwp *l, void *v, register_t *retval) { struct freebsd_sys_mmap_args /* { syscallarg(void *) addr; diff --git a/sys/compat/freebsd/freebsd_ptrace.c b/sys/compat/freebsd/freebsd_ptrace.c index ef8ab3f2a95..050f49132a3 100644 --- a/sys/compat/freebsd/freebsd_ptrace.c +++ b/sys/compat/freebsd/freebsd_ptrace.c @@ -1,4 +1,4 @@ -/* $NetBSD: freebsd_ptrace.c,v 1.15 2007/06/23 15:24:26 dsl Exp $ */ +/* $NetBSD: freebsd_ptrace.c,v 1.16 2007/12/08 18:35:58 dsl Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -71,7 +71,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: freebsd_ptrace.c,v 1.15 2007/06/23 15:24:26 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: freebsd_ptrace.c,v 1.16 2007/12/08 18:35:58 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_ptrace.h" @@ -101,10 +101,7 @@ __KERNEL_RCSID(0, "$NetBSD: freebsd_ptrace.c,v 1.15 2007/06/23 15:24:26 dsl Exp * Process debugging system call. */ int -freebsd_sys_ptrace(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +freebsd_sys_ptrace(struct lwp *l, void *v, register_t *retval) { #if defined(PTRACE) || defined(_LKM) struct freebsd_sys_ptrace_args /* { diff --git a/sys/compat/freebsd/freebsd_sched.c b/sys/compat/freebsd/freebsd_sched.c index aeb5242763f..4601b2e68c2 100644 --- a/sys/compat/freebsd/freebsd_sched.c +++ b/sys/compat/freebsd/freebsd_sched.c @@ -1,4 +1,4 @@ -/* $NetBSD: freebsd_sched.c,v 1.10 2007/10/19 12:16:36 ad Exp $ */ +/* $NetBSD: freebsd_sched.c,v 1.11 2007/12/08 18:35:58 dsl Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: freebsd_sched.c,v 1.10 2007/10/19 12:16:36 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: freebsd_sched.c,v 1.11 2007/12/08 18:35:58 dsl Exp $"); #include <sys/param.h> #include <sys/mount.h> @@ -192,10 +192,7 @@ freebsd_sys_sched_setscheduler(struct lwp *l, void *v, } int -freebsd_sys_sched_getscheduler(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +freebsd_sys_sched_getscheduler(struct lwp *l, void *v, register_t *retval) { struct freebsd_sys_sched_getscheduler_args /* { syscallarg(pid_t) pid; diff --git a/sys/compat/freebsd/freebsd_sysctl.c b/sys/compat/freebsd/freebsd_sysctl.c index ee4b10b6945..d526c463bfa 100644 --- a/sys/compat/freebsd/freebsd_sysctl.c +++ b/sys/compat/freebsd/freebsd_sysctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: freebsd_sysctl.c,v 1.9 2007/08/15 12:07:28 ad Exp $ */ +/* $NetBSD: freebsd_sysctl.c,v 1.10 2007/12/08 18:35:59 dsl Exp $ */ /*- * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: freebsd_sysctl.c,v 1.9 2007/08/15 12:07:28 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: freebsd_sysctl.c,v 1.10 2007/12/08 18:35:59 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -82,10 +82,7 @@ SYSCTL_SETUP(freebsd_sysctl_setup, "freebsd emulated sysctl setup") } int -freebsd_sys_sysctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +freebsd_sys_sysctl(struct lwp *l, void *v, register_t *retval) { struct freebsd_sys_sysctl_args /* { syscallarg(int *) name; diff --git a/sys/compat/hpux/hpux_exec.c b/sys/compat/hpux/hpux_exec.c index 25af5d77561..bc881443873 100644 --- a/sys/compat/hpux/hpux_exec.c +++ b/sys/compat/hpux/hpux_exec.c @@ -1,4 +1,4 @@ -/* $NetBSD: hpux_exec.c,v 1.54 2007/12/04 18:40:08 dsl Exp $ */ +/* $NetBSD: hpux_exec.c,v 1.55 2007/12/08 18:35:59 dsl Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hpux_exec.c,v 1.54 2007/12/04 18:40:08 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hpux_exec.c,v 1.55 2007/12/08 18:35:59 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_syscall_debug.h" @@ -161,10 +161,7 @@ const struct emul emul_hpux = { * execve(). */ int -hpux_sys_execv(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_execv(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_execv_args /* { syscallarg(const char *) path; @@ -180,10 +177,7 @@ hpux_sys_execv(l, v, retval) } int -hpux_sys_execve(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_execve(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_execve_args /* { syscallarg(const char *) path; diff --git a/sys/compat/hpux/hpux_exec_aout.c b/sys/compat/hpux/hpux_exec_aout.c index 2a4f52ac997..e6330ca1846 100644 --- a/sys/compat/hpux/hpux_exec_aout.c +++ b/sys/compat/hpux/hpux_exec_aout.c @@ -1,4 +1,4 @@ -/* $NetBSD: hpux_exec_aout.c,v 1.16 2007/12/04 18:40:09 dsl Exp $ */ +/* $NetBSD: hpux_exec_aout.c,v 1.17 2007/12/08 18:35:59 dsl Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hpux_exec_aout.c,v 1.16 2007/12/04 18:40:09 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hpux_exec_aout.c,v 1.17 2007/12/08 18:35:59 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -103,9 +103,7 @@ static int exec_hpux_prep_zmagic(struct lwp *, struct exec_package *); static int exec_hpux_prep_omagic(struct lwp *, struct exec_package *); int -exec_hpux_makecmds(l, epp) - struct lwp *l; - struct exec_package *epp; +exec_hpux_makecmds(struct lwp *l, struct exec_package *epp) { struct hpux_exec *hpux_ep = epp->ep_hdr; short sysid, magic; @@ -148,9 +146,7 @@ exec_hpux_makecmds(l, epp) } static int -exec_hpux_prep_nmagic(l, epp) - struct lwp *l; - struct exec_package *epp; +exec_hpux_prep_nmagic(struct lwp *l, struct exec_package *epp) { struct hpux_exec *execp = epp->ep_hdr; long bsize, baddr; @@ -182,9 +178,7 @@ exec_hpux_prep_nmagic(l, epp) } static int -exec_hpux_prep_zmagic(l, epp) - struct lwp *l; - struct exec_package *epp; +exec_hpux_prep_zmagic(struct lwp *l, struct exec_package *epp) { struct hpux_exec *execp = epp->ep_hdr; long bsize, baddr; @@ -236,9 +230,7 @@ exec_hpux_prep_zmagic(l, epp) * HP-UX's version of OMAGIC. */ static int -exec_hpux_prep_omagic(l, epp) - struct lwp *l; - struct exec_package *epp; +exec_hpux_prep_omagic(struct lwp *l, struct exec_package *epp) { struct hpux_exec *execp = epp->ep_hdr; long dsize, bsize, baddr; diff --git a/sys/compat/hpux/hpux_file.c b/sys/compat/hpux/hpux_file.c index a40e1fc4680..c9d2832ea4f 100644 --- a/sys/compat/hpux/hpux_file.c +++ b/sys/compat/hpux/hpux_file.c @@ -1,4 +1,4 @@ -/* $NetBSD: hpux_file.c,v 1.39 2007/12/04 18:40:09 dsl Exp $ */ +/* $NetBSD: hpux_file.c,v 1.40 2007/12/08 18:35:59 dsl Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -119,7 +119,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hpux_file.c,v 1.39 2007/12/04 18:40:09 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hpux_file.c,v 1.40 2007/12/08 18:35:59 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -166,10 +166,7 @@ static void bsd_to_hpux_ostat(struct stat *, struct hpux_ostat *); * Just call open(2) with the TRUNC, CREAT and WRONLY flags. */ int -hpux_sys_creat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_creat(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_creat_args /* { syscallarg(const char *) path; @@ -195,10 +192,7 @@ hpux_sys_creat(l, v, retval) * - O_SYNCIO is removed entirely. */ int -hpux_sys_open(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_open(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_open_args /* { syscallarg(const char *) path; @@ -257,10 +251,7 @@ hpux_sys_open(l, v, retval) * HP-UX fcntl(2) system call. */ int -hpux_sys_fcntl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_fcntl(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_fcntl_args /* { syscallarg(int) fd; @@ -424,10 +415,7 @@ hpux_sys_fcntl(l, v, retval) * HP-UX fstat(2) system call. */ int -hpux_sys_fstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_fstat(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_fstat_args /* { syscallarg(int) fd; @@ -450,10 +438,7 @@ hpux_sys_fstat(l, v, retval) * HP-UX stat(2) system call. */ int -hpux_sys_stat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_stat(struct lwp *l, void *v, register_t *retval) { return (hpux_stat1(l, v, retval, FOLLOW)); @@ -463,10 +448,7 @@ hpux_sys_stat(l, v, retval) * HP-UX lstat(2) system call. */ int -hpux_sys_lstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_lstat(struct lwp *l, void *v, register_t *retval) { return (hpux_stat1(l, v, retval, NOFOLLOW)); @@ -476,11 +458,7 @@ hpux_sys_lstat(l, v, retval) * Do the meat of stat(2) and lstat(2). */ static int -hpux_stat1(l, v, retval, flags) - struct lwp *l; - void *v; - register_t *retval; - int flags; +hpux_stat1(struct lwp *l, void *v, register_t *retval, int flags) { struct hpux_sys_stat_args /* { syscallarg(const char *) path; @@ -503,10 +481,7 @@ hpux_stat1(l, v, retval, flags) * The old HP-UX fstat(2) system call. */ int -hpux_sys_fstat_6x(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_fstat_6x(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_fstat_6x_args /* { syscallarg(int) fd; @@ -529,10 +504,7 @@ hpux_sys_fstat_6x(l, v, retval) * The old HP-UX stat(2) system call. */ int -hpux_sys_stat_6x(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_stat_6x(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_stat_6x_args /* { syscallarg(const char *) path; @@ -555,9 +527,7 @@ hpux_sys_stat_6x(l, v, retval) * Convert a NetBSD stat structure to an HP-UX stat structure. */ static void -bsd_to_hpux_stat(sb, hsb) - struct stat *sb; - struct hpux_stat *hsb; +bsd_to_hpux_stat(struct stat *sb, struct hpux_stat *hsb) { memset(hsb, 0, sizeof(struct hpux_stat)); @@ -592,9 +562,7 @@ bsd_to_hpux_stat(sb, hsb) * Convert a NetBSD stat structure to an old-style HP-UX stat structure. */ static void -bsd_to_hpux_ostat(sb, hsb) - struct stat *sb; - struct hpux_ostat *hsb; +bsd_to_hpux_ostat(struct stat *sb, struct hpux_ostat *hsb) { memset(hsb, 0, sizeof(struct hpux_ostat)); @@ -621,10 +589,7 @@ bsd_to_hpux_ostat(sb, hsb) * HP-UX access(2) system call. */ int -hpux_sys_access(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_access(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_access_args /* { syscallarg(const char *) path; @@ -638,10 +603,7 @@ hpux_sys_access(l, v, retval) * HP-UX unlink(2) system call. */ int -hpux_sys_unlink(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_unlink(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_unlink_args /* { syscallarg(char *) path; @@ -654,10 +616,7 @@ hpux_sys_unlink(l, v, retval) * HP-UX chdir(2) system call. */ int -hpux_sys_chdir(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_chdir(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_chdir_args /* { syscallarg(const char *) path; @@ -670,10 +629,7 @@ hpux_sys_chdir(l, v, retval) * HP-UX mknod(2) system call. */ int -hpux_sys_mknod(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_mknod(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_mknod_args /* { syscallarg(const char *) path; @@ -697,10 +653,7 @@ hpux_sys_mknod(l, v, retval) * HP-UX chmod(2) system call. */ int -hpux_sys_chmod(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_chmod(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_chmod_args /* { syscallarg(const char *) path; @@ -714,10 +667,7 @@ hpux_sys_chmod(l, v, retval) * HP-UX chown(2) system call. */ int -hpux_sys_chown(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_chown(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_chown_args /* { syscallarg(const char *) path; @@ -734,10 +684,7 @@ hpux_sys_chown(l, v, retval) * HP-UX rename(2) system call. */ int -hpux_sys_rename(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_rename(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_rename_args /* { syscallarg(const char *) from; @@ -751,10 +698,7 @@ hpux_sys_rename(l, v, retval) * HP-UX mkdir(2) system call. */ int -hpux_sys_mkdir(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_mkdir(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_mkdir_args /* { syscallarg(char *) path; @@ -768,10 +712,7 @@ hpux_sys_mkdir(l, v, retval) * HP-UX rmdir(2) system call. */ int -hpux_sys_rmdir(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_rmdir(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_rmdir_args /* { syscallarg(const char *) path; @@ -784,10 +725,7 @@ hpux_sys_rmdir(l, v, retval) * HP-UX symlink(2) system call. */ int -hpux_sys_symlink(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_symlink(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_symlink_args /* { syscallarg(const char *) path; @@ -801,10 +739,7 @@ hpux_sys_symlink(l, v, retval) * HP-UX readlink(2) system call. */ int -hpux_sys_readlink(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_readlink(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_readlink_args /* { syscallarg(const char *) path; @@ -819,10 +754,7 @@ hpux_sys_readlink(l, v, retval) * HP-UX truncate(2) system call. */ int -hpux_sys_truncate(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_truncate(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_truncate_args /* { syscallarg(const char *) path; diff --git a/sys/compat/hpux/hpux_ipc.c b/sys/compat/hpux/hpux_ipc.c index b72ea1238b1..3b4cc363b42 100644 --- a/sys/compat/hpux/hpux_ipc.c +++ b/sys/compat/hpux/hpux_ipc.c @@ -1,4 +1,4 @@ -/* $NetBSD: hpux_ipc.c,v 1.9 2007/12/04 18:40:09 dsl Exp $ */ +/* $NetBSD: hpux_ipc.c,v 1.10 2007/12/08 18:35:59 dsl Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hpux_ipc.c,v 1.9 2007/12/04 18:40:09 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hpux_ipc.c,v 1.10 2007/12/08 18:35:59 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_sysv.h" @@ -81,9 +81,7 @@ void hpux_to_bsd_oipc_perm(const struct hpux_oipc_perm *, struct ipc_perm *); void -bsd_to_hpux_ipc_perm(bp, hp) - const struct ipc_perm *bp; - struct hpux_ipc_perm *hp; +bsd_to_hpux_ipc_perm(const struct ipc_perm *bp, struct hpux_ipc_perm *hp) { hp->uid = bp->uid; @@ -96,9 +94,7 @@ bsd_to_hpux_ipc_perm(bp, hp) } void -bsd_to_hpux_oipc_perm(bp, hp) - const struct ipc_perm *bp; - struct hpux_oipc_perm *hp; +bsd_to_hpux_oipc_perm(const struct ipc_perm *bp, struct hpux_oipc_perm *hp) { hp->uid = bp->uid; @@ -111,9 +107,7 @@ bsd_to_hpux_oipc_perm(bp, hp) } void -hpux_to_bsd_ipc_perm(hp, bp) - const struct hpux_ipc_perm *hp; - struct ipc_perm *bp; +hpux_to_bsd_ipc_perm(const struct hpux_ipc_perm *hp, struct ipc_perm *bp) { bp->uid = hp->uid; @@ -126,9 +120,7 @@ hpux_to_bsd_ipc_perm(hp, bp) } void -hpux_to_bsd_oipc_perm(hp, bp) - const struct hpux_oipc_perm *hp; - struct ipc_perm *bp; +hpux_to_bsd_oipc_perm(const struct hpux_oipc_perm *hp, struct ipc_perm *bp) { bp->uid = hp->uid; @@ -153,9 +145,7 @@ void hpux_to_bsd_omsqid_ds(const struct hpux_omsqid_ds *, struct msqid_ds *); void -bsd_to_hpux_msqid_ds(bp, hp) - const struct msqid_ds *bp; - struct hpux_msqid_ds *hp; +bsd_to_hpux_msqid_ds(const struct msqid_ds *bp, struct hpux_msqid_ds *hp) { bsd_to_hpux_ipc_perm(&bp->msg_perm, &hp->msg_perm); @@ -172,9 +162,7 @@ bsd_to_hpux_msqid_ds(bp, hp) } void -bsd_to_hpux_omsqid_ds(bp, hp) - const struct msqid_ds *bp; - struct hpux_omsqid_ds *hp; +bsd_to_hpux_omsqid_ds(const struct msqid_ds *bp, struct hpux_omsqid_ds *hp) { bsd_to_hpux_oipc_perm(&bp->msg_perm, &hp->msg_perm); @@ -190,9 +178,7 @@ bsd_to_hpux_omsqid_ds(bp, hp) } void -hpux_to_bsd_msqid_ds(hp, bp) - const struct hpux_msqid_ds *hp; - struct msqid_ds *bp; +hpux_to_bsd_msqid_ds(const struct hpux_msqid_ds *hp, struct msqid_ds *bp) { hpux_to_bsd_ipc_perm(&hp->msg_perm, &bp->msg_perm); @@ -209,9 +195,7 @@ hpux_to_bsd_msqid_ds(hp, bp) } void -hpux_to_bsd_omsqid_ds(hp, bp) - const struct hpux_omsqid_ds *hp; - struct msqid_ds *bp; +hpux_to_bsd_omsqid_ds(const struct hpux_omsqid_ds *hp, struct msqid_ds *bp) { hpux_to_bsd_oipc_perm(&hp->msg_perm, &bp->msg_perm); @@ -228,10 +212,7 @@ hpux_to_bsd_omsqid_ds(hp, bp) } int -hpux_sys_omsgctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_omsgctl(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_omsgctl_args /* { syscallarg(int) msqid; @@ -263,10 +244,7 @@ hpux_sys_omsgctl(l, v, retval) } int -hpux_sys_msgctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_msgctl(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_msgctl_args /* { syscallarg(int) msqid; @@ -310,9 +288,7 @@ void hpux_to_bsd_osemid_ds(const struct hpux_osemid_ds *, struct semid_ds *); void -bsd_to_hpux_semid_ds(bp, hp) - const struct semid_ds *bp; - struct hpux_semid_ds *hp; +bsd_to_hpux_semid_ds(const struct semid_ds *bp, struct hpux_semid_ds *hp) { bsd_to_hpux_ipc_perm(&bp->sem_perm, &hp->sem_perm); @@ -323,9 +299,7 @@ bsd_to_hpux_semid_ds(bp, hp) } void -bsd_to_hpux_osemid_ds(bp, hp) - const struct semid_ds *bp; - struct hpux_osemid_ds *hp; +bsd_to_hpux_osemid_ds(const struct semid_ds *bp, struct hpux_osemid_ds *hp) { bsd_to_hpux_oipc_perm(&bp->sem_perm, &hp->sem_perm); @@ -336,9 +310,7 @@ bsd_to_hpux_osemid_ds(bp, hp) } void -hpux_to_bsd_semid_ds(hp, bp) - const struct hpux_semid_ds *hp; - struct semid_ds *bp; +hpux_to_bsd_semid_ds(const struct hpux_semid_ds *hp, struct semid_ds *bp) { hpux_to_bsd_ipc_perm(&hp->sem_perm, &bp->sem_perm); @@ -349,9 +321,7 @@ hpux_to_bsd_semid_ds(hp, bp) } void -hpux_to_bsd_osemid_ds(hp, bp) - const struct hpux_osemid_ds *hp; - struct semid_ds *bp; +hpux_to_bsd_osemid_ds(const struct hpux_osemid_ds *hp, struct semid_ds *bp) { hpux_to_bsd_oipc_perm(&hp->sem_perm, &bp->sem_perm); @@ -362,10 +332,7 @@ hpux_to_bsd_osemid_ds(hp, bp) } int -hpux_sys_osemctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_osemctl(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_osemctl_args /* { syscallarg(int) semid; @@ -412,10 +379,7 @@ hpux_sys_osemctl(l, v, retval) } int -hpux_sys_semctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_semctl(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_semctl_args /* { syscallarg(int) semid; @@ -474,9 +438,7 @@ void hpux_to_bsd_oshmid_ds(const struct hpux_oshmid_ds *, struct shmid_ds *); void -bsd_to_hpux_shmid_ds(bp, hp) - const struct shmid_ds *bp; - struct hpux_shmid_ds *hp; +bsd_to_hpux_shmid_ds(const struct shmid_ds *bp, struct hpux_shmid_ds *hp) { bsd_to_hpux_ipc_perm(&bp->shm_perm, &hp->shm_perm); @@ -492,9 +454,7 @@ bsd_to_hpux_shmid_ds(bp, hp) } void -bsd_to_hpux_oshmid_ds(bp, hp) - const struct shmid_ds *bp; - struct hpux_oshmid_ds *hp; +bsd_to_hpux_oshmid_ds(const struct shmid_ds *bp, struct hpux_oshmid_ds *hp) { bsd_to_hpux_oipc_perm(&bp->shm_perm, &hp->shm_perm); @@ -510,9 +470,7 @@ bsd_to_hpux_oshmid_ds(bp, hp) } void -hpux_to_bsd_shmid_ds(hp, bp) - const struct hpux_shmid_ds *hp; - struct shmid_ds *bp; +hpux_to_bsd_shmid_ds(const struct hpux_shmid_ds *hp, struct shmid_ds *bp) { hpux_to_bsd_ipc_perm(&hp->shm_perm, &bp->shm_perm); @@ -527,9 +485,7 @@ hpux_to_bsd_shmid_ds(hp, bp) } void -hpux_to_bsd_oshmid_ds(hp, bp) - const struct hpux_oshmid_ds *hp; - struct shmid_ds *bp; +hpux_to_bsd_oshmid_ds(const struct hpux_oshmid_ds *hp, struct shmid_ds *bp) { hpux_to_bsd_oipc_perm(&hp->shm_perm, &bp->shm_perm); @@ -544,10 +500,7 @@ hpux_to_bsd_oshmid_ds(hp, bp) } int -hpux_sys_oshmctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_oshmctl(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_oshmctl_args /* { syscallarg(int) shmid; @@ -579,10 +532,7 @@ hpux_sys_oshmctl(l, v, retval) } int -hpux_sys_shmctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_shmctl(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_shmctl_args /* { syscallarg(int) shmid; diff --git a/sys/compat/hpux/hpux_net.c b/sys/compat/hpux/hpux_net.c index 1e4ef264316..b3fd60f7f8b 100644 --- a/sys/compat/hpux/hpux_net.c +++ b/sys/compat/hpux/hpux_net.c @@ -1,4 +1,4 @@ -/* $NetBSD: hpux_net.c,v 1.36 2007/12/04 18:40:09 dsl Exp $ */ +/* $NetBSD: hpux_net.c,v 1.37 2007/12/08 18:35:59 dsl Exp $ */ /* * Copyright (c) 1990, 1993 @@ -82,7 +82,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hpux_net.c,v 1.36 2007/12/04 18:40:09 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hpux_net.c,v 1.37 2007/12/08 18:35:59 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -177,10 +177,7 @@ struct hpuxtobsdipc { * Gleened from disassembled libbsdipc.a syscall entries. */ int -hpux_sys_netioctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_netioctl(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_netioctl_args *uap = v; int *args, i; @@ -203,9 +200,7 @@ hpux_sys_netioctl(l, v, retval) } void -socksetsize(size, m) - int size; - struct mbuf *m; +socksetsize(int size, struct mbuf *m) { int tmp; @@ -231,10 +226,7 @@ socksetsize(size, m) /* ARGSUSED */ int -hpux_sys_setsockopt(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_setsockopt(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_setsockopt_args *uap = v; struct proc *p = l->l_proc; @@ -279,10 +271,7 @@ hpux_sys_setsockopt(l, v, retval) /* ARGSUSED */ int -hpux_sys_setsockopt2(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_setsockopt2(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_setsockopt2_args *uap = v; struct proc *p = l->l_proc; @@ -315,10 +304,7 @@ hpux_sys_setsockopt2(l, v, retval) } int -hpux_sys_getsockopt(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_getsockopt(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_getsockopt_args *uap = v; struct proc *p = l->l_proc; diff --git a/sys/compat/hpux/hpux_sig.c b/sys/compat/hpux/hpux_sig.c index ef9da11947e..1cd43cb4a33 100644 --- a/sys/compat/hpux/hpux_sig.c +++ b/sys/compat/hpux/hpux_sig.c @@ -1,4 +1,4 @@ -/* $NetBSD: hpux_sig.c,v 1.36 2007/12/04 18:40:09 dsl Exp $ */ +/* $NetBSD: hpux_sig.c,v 1.37 2007/12/08 18:36:00 dsl Exp $ */ /* * Copyright (c) 1990, 1993 @@ -82,7 +82,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hpux_sig.c,v 1.36 2007/12/04 18:40:09 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hpux_sig.c,v 1.37 2007/12/08 18:36:00 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -111,10 +111,7 @@ extern const unsigned char hpux_to_native_signo[]; * doubt any program of interest mixes the two semantics. */ int -hpux_sys_sigvec(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_sigvec(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_sigvec_args *uap = v; struct sigvec nsv, osv; @@ -162,10 +159,7 @@ hpux_sys_sigvec(l, v, retval) } int -hpux_sys_sigblock(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_sigblock(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_sigblock_args *uap = v; sigset_t nmask; @@ -182,10 +176,7 @@ hpux_sys_sigblock(l, v, retval) } int -hpux_sys_sigsetmask(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_sigsetmask(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_sigsetmask_args *uap = v; @@ -200,10 +191,7 @@ hpux_sys_sigsetmask(l, v, retval) } int -hpux_sys_sigpause(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_sigpause(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_sigpause_args *uap = v; sigset_t mask; @@ -214,10 +202,7 @@ hpux_sys_sigpause(l, v, retval) /* not totally correct, but close enuf' */ int -hpux_sys_kill(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_kill(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_kill_args *uap = v; @@ -244,10 +229,7 @@ hpux_sys_kill(l, v, retval) * XXX We don't handle all HP-UX signals! */ int -hpux_sys_sigprocmask(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_sigprocmask(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_sigprocmask_args *uap = v; int error = 0; @@ -296,10 +278,7 @@ hpux_sys_sigprocmask(l, v, retval) } int -hpux_sys_sigpending(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_sigpending(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_sigpending_args *uap = v; hpux_sigset_t sigset; @@ -309,10 +288,7 @@ hpux_sys_sigpending(l, v, retval) } int -hpux_sys_sigsuspend(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_sigsuspend(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_sigsuspend_args *uap = v; hpux_sigset_t sigset; @@ -328,10 +304,7 @@ hpux_sys_sigsuspend(l, v, retval) } int -hpux_sys_sigaction(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_sigaction(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_sigaction_args *uap = v; struct hpux_sigaction action; @@ -390,10 +363,7 @@ hpux_sys_sigaction(l, v, retval) } int -hpux_sys_ssig_6x(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_ssig_6x(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_ssig_6x_args /* { syscallarg(int) signo; @@ -434,8 +404,7 @@ hpux_sys_ssig_6x(l, v, retval) /* signal numbers: convert from HPUX to BSD */ int -hpuxtobsdsig(sig) - int sig; +hpuxtobsdsig(int sig) { if (sig < 0 || sig >= NSIG) return(0); @@ -444,8 +413,7 @@ hpuxtobsdsig(sig) /* signal numbers: convert from BSD to HPUX */ int -bsdtohpuxsig(sig) - int sig; +bsdtohpuxsig(int sig) { if (sig < 0 || sig >= NSIG) return(0); @@ -454,9 +422,7 @@ bsdtohpuxsig(sig) /* signal masks: convert from HPUX to BSD (not pretty or fast) */ void -hpuxtobsdmask(hpuxmask, bsdmask) - int hpuxmask; - sigset_t *bsdmask; +hpuxtobsdmask(int hpuxmask, sigset_t *bsdmask) { int sig, nsig; @@ -470,9 +436,7 @@ hpuxtobsdmask(hpuxmask, bsdmask) } void -bsdtohpuxmask(bsdmask, hpuxmask) - const sigset_t *bsdmask; - int *hpuxmask; +bsdtohpuxmask(const sigset_t *bsdmask, int *hpuxmask) { int sig, nsig; diff --git a/sys/compat/hpux/hpux_tty.c b/sys/compat/hpux/hpux_tty.c index 419b9ee8afe..c962557096f 100644 --- a/sys/compat/hpux/hpux_tty.c +++ b/sys/compat/hpux/hpux_tty.c @@ -1,4 +1,4 @@ -/* $NetBSD: hpux_tty.c,v 1.31 2007/03/04 06:01:16 christos Exp $ */ +/* $NetBSD: hpux_tty.c,v 1.32 2007/12/08 18:36:00 dsl Exp $ */ /* * Copyright (c) 1990, 1993 @@ -82,7 +82,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hpux_tty.c,v 1.31 2007/03/04 06:01:16 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hpux_tty.c,v 1.32 2007/12/08 18:36:00 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_43.h" @@ -423,10 +423,7 @@ hpux_termio(fd, com, data, l) } void -termiototermios(tio, tios, bsdtios) - struct hpux_termio *tio; - struct hpux_termios *tios; - struct termios *bsdtios; +termiototermios(struct hpux_termio *tio, struct hpux_termios *tios, struct termios *bsdtios) { int i; @@ -455,9 +452,7 @@ termiototermios(tio, tios, bsdtios) } void -termiostotermio(tios, tio) - struct hpux_termios *tios; - struct hpux_termio *tio; +termiostotermio(struct hpux_termios *tios, struct hpux_termio *tio) { int i; @@ -478,8 +473,7 @@ termiostotermio(tios, tio) } int -bsdtohpuxbaud(bsdspeed) - long bsdspeed; +bsdtohpuxbaud(long bsdspeed) { switch (bsdspeed) { case B0: return(TIO_B0); @@ -503,8 +497,7 @@ bsdtohpuxbaud(bsdspeed) } int -hpuxtobsdbaud(hpux_speed) - int hpux_speed; +hpuxtobsdbaud(int hpux_speed) { static const int hpuxtobsdbaudtab[32] = { B0, B50, B75, B110, B134, B150, B200, B300, @@ -519,10 +512,7 @@ hpuxtobsdbaud(hpux_speed) } int -hpux_sys_stty_6x(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_stty_6x(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_stty_6x_args /* { syscallarg(int) fd; @@ -533,10 +523,7 @@ hpux_sys_stty_6x(l, v, retval) } int -hpux_sys_gtty_6x(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +hpux_sys_gtty_6x(struct lwp *l, void *v, register_t *retval) { struct hpux_sys_gtty_6x_args /* { syscallarg(int) fd; diff --git a/sys/compat/ibcs2/ibcs2_exec.c b/sys/compat/ibcs2/ibcs2_exec.c index f816950c4f0..278e502d5fd 100644 --- a/sys/compat/ibcs2/ibcs2_exec.c +++ b/sys/compat/ibcs2/ibcs2_exec.c @@ -1,4 +1,4 @@ -/* $NetBSD: ibcs2_exec.c,v 1.69 2007/12/04 18:40:10 dsl Exp $ */ +/* $NetBSD: ibcs2_exec.c,v 1.70 2007/12/08 18:36:00 dsl Exp $ */ /* * Copyright (c) 1994, 1995, 1998 Scott Bartram @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ibcs2_exec.c,v 1.69 2007/12/04 18:40:10 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ibcs2_exec.c,v 1.70 2007/12/08 18:36:00 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_syscall_debug.h" @@ -123,9 +123,7 @@ const struct emul emul_ibcs2 = { * behaviour accordingly can do so. */ static void -ibcs2_e_proc_exec(p, epp) - struct proc *p; - struct exec_package *epp; +ibcs2_e_proc_exec(struct proc *p, struct exec_package *epp) { if (epp->ep_esch->es_makecmds == exec_ibcs2_xout_makecmds) p->p_emuldata = IBCS2_EXEC_XENIX; diff --git a/sys/compat/ibcs2/ibcs2_exec_coff.c b/sys/compat/ibcs2/ibcs2_exec_coff.c index 147a084dca3..dd0f3a41d14 100644 --- a/sys/compat/ibcs2/ibcs2_exec_coff.c +++ b/sys/compat/ibcs2/ibcs2_exec_coff.c @@ -1,4 +1,4 @@ -/* $NetBSD: ibcs2_exec_coff.c,v 1.21 2007/12/04 18:40:10 dsl Exp $ */ +/* $NetBSD: ibcs2_exec_coff.c,v 1.22 2007/12/08 18:36:00 dsl Exp $ */ /* * Copyright (c) 1994, 1995, 1998 Scott Bartram @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ibcs2_exec_coff.c,v 1.21 2007/12/04 18:40:10 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ibcs2_exec_coff.c,v 1.22 2007/12/08 18:36:00 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -92,9 +92,7 @@ static int coff_find_section(struct lwp *, struct vnode *, */ int -exec_ibcs2_coff_makecmds(l, epp) - struct lwp *l; - struct exec_package *epp; +exec_ibcs2_coff_makecmds(struct lwp *l, struct exec_package *epp) { int error; struct coff_filehdr *fp = epp->ep_hdr; @@ -136,11 +134,7 @@ exec_ibcs2_coff_makecmds(l, epp) */ int -exec_ibcs2_coff_prep_omagic(l, epp, fp, ap) - struct lwp *l; - struct exec_package *epp; - struct coff_filehdr *fp; - struct coff_aouthdr *ap; +exec_ibcs2_coff_prep_omagic(struct lwp *l, struct exec_package *epp, struct coff_filehdr *fp, struct coff_aouthdr *ap) { epp->ep_taddr = COFF_SEGMENT_ALIGN(fp, ap, ap->a_tstart); epp->ep_tsize = ap->a_tsize; @@ -188,11 +182,7 @@ exec_ibcs2_coff_prep_omagic(l, epp, fp, ap) */ int -exec_ibcs2_coff_prep_nmagic(l, epp, fp, ap) - struct lwp *l; - struct exec_package *epp; - struct coff_filehdr *fp; - struct coff_aouthdr *ap; +exec_ibcs2_coff_prep_nmagic(struct lwp *l, struct exec_package *epp, struct coff_filehdr *fp, struct coff_aouthdr *ap) { long toverlap, doverlap; u_long tsize, tend; @@ -318,12 +308,7 @@ exec_ibcs2_coff_prep_nmagic(l, epp, fp, ap) */ static int -coff_find_section(l, vp, fp, sh, s_type) - struct lwp *l; - struct vnode *vp; - struct coff_filehdr *fp; - struct coff_scnhdr *sh; - int s_type; +coff_find_section(struct lwp *l, struct vnode *vp, struct coff_filehdr *fp, struct coff_scnhdr *sh, int s_type) { int i, pos, siz, error; size_t resid; @@ -363,11 +348,7 @@ coff_find_section(l, vp, fp, sh, s_type) */ int -exec_ibcs2_coff_prep_zmagic(l, epp, fp, ap) - struct lwp *l; - struct exec_package *epp; - struct coff_filehdr *fp; - struct coff_aouthdr *ap; +exec_ibcs2_coff_prep_zmagic(struct lwp *l, struct exec_package *epp, struct coff_filehdr *fp, struct coff_aouthdr *ap) { int error; u_long offset; @@ -523,10 +504,7 @@ exec_ibcs2_coff_prep_zmagic(l, epp, fp, ap) } static int -coff_load_shlib(l, path, epp) - struct lwp *l; - const char *path; - struct exec_package *epp; +coff_load_shlib(struct lwp *l, const char *path, struct exec_package *epp) { int error, siz; int taddr, tsize, daddr, dsize, offset; diff --git a/sys/compat/ibcs2/ibcs2_exec_elf32.c b/sys/compat/ibcs2/ibcs2_exec_elf32.c index e3472c0ede3..676df44b254 100644 --- a/sys/compat/ibcs2/ibcs2_exec_elf32.c +++ b/sys/compat/ibcs2/ibcs2_exec_elf32.c @@ -1,4 +1,4 @@ -/* $NetBSD: ibcs2_exec_elf32.c,v 1.16 2007/12/04 18:40:10 dsl Exp $ */ +/* $NetBSD: ibcs2_exec_elf32.c,v 1.17 2007/12/08 18:36:00 dsl Exp $ */ /* * Copyright (c) 1994, 1995, 1998 Scott Bartram @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ibcs2_exec_elf32.c,v 1.16 2007/12/04 18:40:10 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ibcs2_exec_elf32.c,v 1.17 2007/12/08 18:36:00 dsl Exp $"); #define ELFSIZE 32 @@ -74,10 +74,7 @@ static int ibcs2_elf32_signature(struct lwp *l, struct exec_package *, #define SCO_SIGNATURE "\004\0\0\0\014\0\0\0\001\0\0\0SCO\0" static int -ibcs2_elf32_signature(l, epp, eh) - struct lwp *l; - struct exec_package *epp; - Elf32_Ehdr *eh; +ibcs2_elf32_signature(struct lwp *l, struct exec_package *epp, Elf32_Ehdr *eh) { size_t shsize = sizeof(Elf32_Shdr) * eh->e_shnum; size_t i; diff --git a/sys/compat/ibcs2/ibcs2_exec_xout.c b/sys/compat/ibcs2/ibcs2_exec_xout.c index 0f6e9f30e06..42aefdbd7bb 100644 --- a/sys/compat/ibcs2/ibcs2_exec_xout.c +++ b/sys/compat/ibcs2/ibcs2_exec_xout.c @@ -1,4 +1,4 @@ -/* $NetBSD: ibcs2_exec_xout.c,v 1.17 2007/12/04 18:40:10 dsl Exp $ */ +/* $NetBSD: ibcs2_exec_xout.c,v 1.18 2007/12/08 18:36:01 dsl Exp $ */ /* * Copyright (c) 1994, 1995, 1998 Scott Bartram @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ibcs2_exec_xout.c,v 1.17 2007/12/04 18:40:10 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ibcs2_exec_xout.c,v 1.18 2007/12/08 18:36:01 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -67,9 +67,7 @@ int exec_ibcs2_xout_prep_zmagic(struct lwp *, struct exec_package *, struct xexec *, struct xext *); int -exec_ibcs2_xout_makecmds(l, epp) - struct lwp *l; - struct exec_package *epp; +exec_ibcs2_xout_makecmds(struct lwp *l, struct exec_package *epp) { int error; struct xexec *xp = epp->ep_hdr; @@ -103,11 +101,7 @@ exec_ibcs2_xout_makecmds(l, epp) */ int -exec_ibcs2_xout_prep_nmagic(l, epp, xp, xep) - struct lwp *l; - struct exec_package *epp; - struct xexec *xp; - struct xext *xep; +exec_ibcs2_xout_prep_nmagic(struct lwp *l, struct exec_package *epp, struct xexec *xp, struct xext *xep) { int error; size_t nseg, i; diff --git a/sys/compat/ibcs2/ibcs2_fcntl.c b/sys/compat/ibcs2/ibcs2_fcntl.c index 84c8e2db40c..6721d675e44 100644 --- a/sys/compat/ibcs2/ibcs2_fcntl.c +++ b/sys/compat/ibcs2/ibcs2_fcntl.c @@ -1,4 +1,4 @@ -/* $NetBSD: ibcs2_fcntl.c,v 1.30 2007/12/04 18:40:10 dsl Exp $ */ +/* $NetBSD: ibcs2_fcntl.c,v 1.31 2007/12/08 18:36:01 dsl Exp $ */ /* * Copyright (c) 1995 Scott Bartram @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ibcs2_fcntl.c,v 1.30 2007/12/04 18:40:10 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ibcs2_fcntl.c,v 1.31 2007/12/08 18:36:01 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -58,8 +58,7 @@ static int ioflags2oflags(int); static int oflags2ioflags(int); static int -cvt_o_flags(flags) - int flags; +cvt_o_flags(int flags) { int r = 0; @@ -76,9 +75,7 @@ cvt_o_flags(flags) } static void -cvt_flock2iflock(flp, iflp) - struct flock *flp; - struct ibcs2_flock *iflp; +cvt_flock2iflock(struct flock *flp, struct ibcs2_flock *iflp) { switch (flp->l_type) { case F_RDLCK: @@ -99,9 +96,7 @@ cvt_flock2iflock(flp, iflp) } static void -cvt_iflock2flock(iflp, flp) - struct ibcs2_flock *iflp; - struct flock *flp; +cvt_iflock2flock(struct ibcs2_flock *iflp, struct flock *flp) { flp->l_start = (off_t)iflp->l_start; flp->l_len = (off_t)iflp->l_len; @@ -122,8 +117,7 @@ cvt_iflock2flock(iflp, flp) /* convert iBCS2 mode into NetBSD mode */ static int -ioflags2oflags(flags) - int flags; +ioflags2oflags(int flags) { int r = 0; @@ -143,8 +137,7 @@ ioflags2oflags(flags) /* convert NetBSD mode into iBCS2 mode */ static int -oflags2ioflags(flags) - int flags; +oflags2ioflags(int flags) { int r = 0; @@ -163,10 +156,7 @@ oflags2ioflags(flags) } int -ibcs2_sys_open(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_open(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_open_args /* { syscallarg(char *) path; @@ -196,10 +186,7 @@ ibcs2_sys_open(l, v, retval) } int -ibcs2_sys_creat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_creat(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_creat_args /* { syscallarg(char *) path; @@ -214,10 +201,7 @@ ibcs2_sys_creat(l, v, retval) } int -ibcs2_sys_access(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_access(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_access_args /* { syscallarg(char *) path; @@ -264,10 +248,7 @@ ibcs2_sys_eaccess(struct lwp *l, void *v, register_t *retval) } int -ibcs2_sys_fcntl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_fcntl(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_fcntl_args /* { syscallarg(int) fd; diff --git a/sys/compat/ibcs2/ibcs2_ioctl.c b/sys/compat/ibcs2/ibcs2_ioctl.c index b05e6c8d8fe..7ad86e97842 100644 --- a/sys/compat/ibcs2/ibcs2_ioctl.c +++ b/sys/compat/ibcs2/ibcs2_ioctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: ibcs2_ioctl.c,v 1.40 2007/12/04 18:40:10 dsl Exp $ */ +/* $NetBSD: ibcs2_ioctl.c,v 1.41 2007/12/08 18:36:01 dsl Exp $ */ /* * Copyright (c) 1994, 1995 Scott Bartram @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ibcs2_ioctl.c,v 1.40 2007/12/04 18:40:10 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ibcs2_ioctl.c,v 1.41 2007/12/08 18:36:01 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -119,9 +119,7 @@ static void stios2stio(struct ibcs2_termios *, struct ibcs2_termio *); static void stio2stios(struct ibcs2_termio *, struct ibcs2_termios *); static void -stios2btios(st, bt) - struct ibcs2_termios *st; - struct termios *bt; +stios2btios(struct ibcs2_termios *st, struct termios *bt) { u_long l, r; @@ -212,9 +210,7 @@ stios2btios(st, bt) } static void -btios2stios(bt, st) - struct termios *bt; - struct ibcs2_termios *st; +btios2stios(struct termios *bt, struct ibcs2_termios *st) { int i; u_long l, r; @@ -303,9 +299,7 @@ btios2stios(bt, st) } static void -stios2stio(ts, t) - struct ibcs2_termios *ts; - struct ibcs2_termio *t; +stios2stio(struct ibcs2_termios *ts, struct ibcs2_termio *t) { t->c_iflag = ts->c_iflag; @@ -317,9 +311,7 @@ stios2stio(ts, t) } static void -stio2stios(t, ts) - struct ibcs2_termio *t; - struct ibcs2_termios *ts; +stio2stios(struct ibcs2_termio *t, struct ibcs2_termios *ts) { ts->c_iflag = t->c_iflag; @@ -331,10 +323,7 @@ stio2stios(t, ts) } int -ibcs2_sys_ioctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_ioctl(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_ioctl_args /* { syscallarg(int) fd; diff --git a/sys/compat/ibcs2/ibcs2_ipc.c b/sys/compat/ibcs2/ibcs2_ipc.c index 16e90f9cf4a..530b1125e6d 100644 --- a/sys/compat/ibcs2/ibcs2_ipc.c +++ b/sys/compat/ibcs2/ibcs2_ipc.c @@ -1,4 +1,4 @@ -/* $NetBSD: ibcs2_ipc.c,v 1.25 2007/12/04 18:40:10 dsl Exp $ */ +/* $NetBSD: ibcs2_ipc.c,v 1.26 2007/12/08 18:36:01 dsl Exp $ */ /* * Copyright (c) 1995 Scott Bartram @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ibcs2_ipc.c,v 1.25 2007/12/04 18:40:10 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ibcs2_ipc.c,v 1.26 2007/12/08 18:36:01 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_sysv.h" @@ -163,10 +163,7 @@ cvt_imsqid2msqid(struct ibcs2_msqid_ds *ibp, struct msqid_ds *bp) } int -ibcs2_sys_msgsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_msgsys(struct lwp *l, void *v, register_t *retval) { #ifdef SYSVMSG struct ibcs2_sys_msgsys_args /* { @@ -250,9 +247,7 @@ static void cvt_sem2isem(struct sem *, struct ibcs2_sem *); static void cvt_isem2sem(struct ibcs2_sem *, struct sem *); static void -cvt_sem2isem(bp, ibp) - struct __sem *bp; - struct ibcs2_sem *ibp; +cvt_sem2isem(struct __sem *bp, struct ibcs2_sem *ibp) { ibp->semval = bp->semval; ibp->sempid = bp->sempid; @@ -261,9 +256,7 @@ cvt_sem2isem(bp, ibp) } static void -cvt_isem2sem(ibp, bp) - struct ibcs2_sem *ibp; - struct __sem *bp; +cvt_isem2sem(struct ibcs2_sem *ibp, struct __sem *bp) { bp->semval = ibp->semval; bp->sempid = ibp->sempid; @@ -294,10 +287,7 @@ cvt_isemid2semid(const struct ibcs2_semid_ds *ibp, struct semid_ds *bp) } int -ibcs2_sys_semsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_semsys(struct lwp *l, void *v, register_t *retval) { #ifdef SYSVSEM struct ibcs2_sys_semsys_args /* { @@ -399,10 +389,7 @@ cvt_ishmid2shmid(const struct ibcs2_shmid_ds *ibp, struct shmid_ds *bp) } int -ibcs2_sys_shmsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_shmsys(struct lwp *l, void *v, register_t *retval) { #ifdef SYSVSHM struct ibcs2_sys_shmsys_args /* { diff --git a/sys/compat/ibcs2/ibcs2_misc.c b/sys/compat/ibcs2/ibcs2_misc.c index 3b134db7248..f585d69dba4 100644 --- a/sys/compat/ibcs2/ibcs2_misc.c +++ b/sys/compat/ibcs2/ibcs2_misc.c @@ -1,4 +1,4 @@ -/* $NetBSD: ibcs2_misc.c,v 1.94 2007/07/17 20:34:40 christos Exp $ */ +/* $NetBSD: ibcs2_misc.c,v 1.95 2007/12/08 18:36:01 dsl Exp $ */ /* * Copyright (c) 1992, 1993 @@ -95,7 +95,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ibcs2_misc.c,v 1.94 2007/07/17 20:34:40 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ibcs2_misc.c,v 1.95 2007/12/08 18:36:01 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -157,10 +157,7 @@ __KERNEL_RCSID(0, "$NetBSD: ibcs2_misc.c,v 1.94 2007/07/17 20:34:40 christos Exp #include <compat/sys/mount.h> int -ibcs2_sys_ulimit(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_ulimit(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_ulimit_args /* { syscallarg(int) cmd; @@ -208,10 +205,7 @@ ibcs2_sys_ulimit(l, v, retval) } int -ibcs2_sys_waitsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_waitsys(struct lwp *l, void *v, register_t *retval) { #if defined(__i386__) struct ibcs2_sys_waitsys_args /* { @@ -245,10 +239,7 @@ ibcs2_sys_waitsys(l, v, retval) } int -ibcs2_sys_execv(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_execv(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_execv_args /* { syscallarg(const char *) path; @@ -264,10 +255,7 @@ ibcs2_sys_execv(l, v, retval) } int -ibcs2_sys_execve(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_execve(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_execve_args /* { syscallarg(const char *) path; @@ -284,10 +272,7 @@ ibcs2_sys_execve(l, v, retval) } int -ibcs2_sys_umount(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_umount(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_umount_args /* { syscallarg(char *) name; @@ -379,10 +364,7 @@ ibcs2_sys_mount(struct lwp *l, void *v, */ int -ibcs2_sys_getdents(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_getdents(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_getdents_args /* { syscallarg(int) fd; @@ -509,10 +491,7 @@ out1: } int -ibcs2_sys_read(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_read(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_read_args /* { syscallarg(int) fd; @@ -642,10 +621,7 @@ out1: } int -ibcs2_sys_mknod(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_mknod(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_mknod_args /* { syscallarg(const char *) path; @@ -668,10 +644,7 @@ ibcs2_sys_mknod(l, v, retval) } int -ibcs2_sys_getgroups(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_getgroups(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_getgroups_args /* { syscallarg(int) gidsetsize; @@ -713,10 +686,7 @@ ibcs2_sys_getgroups(l, v, retval) #define COMPAT_NGROUPS16 16 int -ibcs2_sys_setgroups(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_setgroups(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_setgroups_args /* { syscallarg(int) gidsetsize; @@ -750,10 +720,7 @@ ibcs2_sys_setgroups(l, v, retval) } int -ibcs2_sys_setuid(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_setuid(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_setuid_args /* { syscallarg(int) uid; @@ -765,10 +732,7 @@ ibcs2_sys_setuid(l, v, retval) } int -ibcs2_sys_setgid(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_setgid(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_setgid_args /* { syscallarg(int) gid; @@ -798,10 +762,7 @@ xenix_sys_ftime(struct lwp *l, void *v, register_t *retval) } int -ibcs2_sys_time(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_time(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_time_args /* { syscallarg(ibcs2_time_t *) tp; @@ -819,10 +780,7 @@ ibcs2_sys_time(l, v, retval) } int -ibcs2_sys_pathconf(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_pathconf(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_pathconf_args /* { syscallarg(char *) path; @@ -833,10 +791,7 @@ ibcs2_sys_pathconf(l, v, retval) } int -ibcs2_sys_fpathconf(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_fpathconf(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_fpathconf_args /* { syscallarg(int) fd; @@ -847,10 +802,7 @@ ibcs2_sys_fpathconf(l, v, retval) } int -ibcs2_sys_sysconf(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_sysconf(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_sysconf_args /* { syscallarg(int) name; @@ -918,10 +870,7 @@ ibcs2_sys_sysconf(l, v, retval) } int -ibcs2_sys_alarm(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_alarm(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_alarm_args /* { syscallarg(unsigned) sec; @@ -981,10 +930,7 @@ ibcs2_sys_putmsg(struct lwp *l, void *v, } int -ibcs2_sys_times(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_times(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_times_args /* { syscallarg(struct tms *) tp; @@ -1012,10 +958,7 @@ ibcs2_sys_times(l, v, retval) } int -ibcs2_sys_stime(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_stime(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_stime_args /* { syscallarg(long *) timep; @@ -1031,10 +974,7 @@ ibcs2_sys_stime(l, v, retval) } int -ibcs2_sys_utime(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_utime(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_utime_args /* { syscallarg(const char *) path; @@ -1063,10 +1003,7 @@ ibcs2_sys_utime(l, v, retval) } int -ibcs2_sys_nice(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_nice(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_nice_args /* { syscallarg(int) incr; @@ -1088,10 +1025,7 @@ ibcs2_sys_nice(l, v, retval) */ int -ibcs2_sys_pgrpsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_pgrpsys(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_pgrpsys_args /* { syscallarg(int) type; @@ -1241,10 +1175,7 @@ ibcs2_sys_sysfs(struct lwp *l, void *v, register_t *retval) } int -xenix_sys_rdchk(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +xenix_sys_rdchk(struct lwp *l, void *v, register_t *retval) { struct xenix_sys_rdchk_args /* { syscallarg(int) fd; @@ -1267,10 +1198,7 @@ xenix_sys_rdchk(l, v, retval) } int -xenix_sys_chsize(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +xenix_sys_chsize(struct lwp *l, void *v, register_t *retval) { struct xenix_sys_chsize_args /* { syscallarg(int) fd; @@ -1285,10 +1213,7 @@ xenix_sys_chsize(l, v, retval) } int -xenix_sys_nap(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +xenix_sys_nap(struct lwp *l, void *v, register_t *retval) { struct xenix_sys_nap_args /* { syscallarg(long) millisec; @@ -1308,10 +1233,7 @@ xenix_sys_nap(l, v, retval) } int -ibcs2_sys_unlink(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_unlink(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_unlink_args /* { syscallarg(const char *) path; @@ -1321,10 +1243,7 @@ ibcs2_sys_unlink(l, v, retval) } int -ibcs2_sys_chdir(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_chdir(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_chdir_args /* { syscallarg(const char *) path; @@ -1334,10 +1253,7 @@ ibcs2_sys_chdir(l, v, retval) } int -ibcs2_sys_chmod(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_chmod(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_chmod_args /* { syscallarg(const char *) path; @@ -1348,10 +1264,7 @@ ibcs2_sys_chmod(l, v, retval) } int -ibcs2_sys_chown(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_chown(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_chown_args /* { syscallarg(const char *) path; @@ -1363,10 +1276,7 @@ ibcs2_sys_chown(l, v, retval) } int -ibcs2_sys_rmdir(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_rmdir(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_rmdir_args /* { syscallarg(const char *) path; @@ -1376,10 +1286,7 @@ ibcs2_sys_rmdir(l, v, retval) } int -ibcs2_sys_mkdir(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_mkdir(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_mkdir_args /* { syscallarg(const char *) path; @@ -1390,10 +1297,7 @@ ibcs2_sys_mkdir(l, v, retval) } int -ibcs2_sys_symlink(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_symlink(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_symlink_args /* { syscallarg(const char *) path; @@ -1404,10 +1308,7 @@ ibcs2_sys_symlink(l, v, retval) } int -ibcs2_sys_rename(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_rename(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_rename_args /* { syscallarg(const char *) from; @@ -1418,10 +1319,7 @@ ibcs2_sys_rename(l, v, retval) } int -ibcs2_sys_readlink(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_readlink(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_readlink_args /* { syscallarg(const char *) path; @@ -1438,10 +1336,7 @@ ibcs2_sys_readlink(l, v, retval) */ int -ibcs2_sys_mmap(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_mmap(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_mmap_args /* { syscallarg(ibcs2_void *) addr; @@ -1471,10 +1366,7 @@ ibcs2_sys_mmap(l, v, retval) } int -ibcs2_sys_memcntl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_memcntl(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_memcntl_args /* { syscallarg(ibcs2_void *) addr; @@ -1537,10 +1429,7 @@ ibcs2_sys_gettimeofday(struct lwp *l, void *v, } int -ibcs2_sys_settimeofday(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_settimeofday(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_settimeofday_args /* { syscallarg(struct timeval *) tp; @@ -1588,10 +1477,7 @@ ibcs2_sys_scoinfo(struct lwp *l, void *v, register_t *retval) #define X_LK_TESTLK 8 int -xenix_sys_locking(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +xenix_sys_locking(struct lwp *l, void *v, register_t *retval) { struct xenix_sys_locking_args /* { syscallarg(int) fd; diff --git a/sys/compat/ibcs2/ibcs2_signal.c b/sys/compat/ibcs2/ibcs2_signal.c index f80dfdf4f68..e7bc15c67db 100644 --- a/sys/compat/ibcs2/ibcs2_signal.c +++ b/sys/compat/ibcs2/ibcs2_signal.c @@ -1,4 +1,4 @@ -/* $NetBSD: ibcs2_signal.c,v 1.27 2007/12/04 18:40:11 dsl Exp $ */ +/* $NetBSD: ibcs2_signal.c,v 1.28 2007/12/08 18:36:01 dsl Exp $ */ /* * Copyright (c) 1995 Scott Bartram @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ibcs2_signal.c,v 1.27 2007/12/04 18:40:11 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ibcs2_signal.c,v 1.28 2007/12/08 18:36:01 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -61,9 +61,7 @@ void ibcs2_to_native_sigaction(const struct ibcs2_sigaction *, struct sigaction void native_to_ibcs2_sigaction(const struct sigaction *, struct ibcs2_sigaction *); void -ibcs2_to_native_sigset(iss, bss) - const ibcs2_sigset_t *iss; - sigset_t *bss; +ibcs2_to_native_sigset(const ibcs2_sigset_t *iss, sigset_t *bss) { int i, newsig; @@ -78,9 +76,7 @@ ibcs2_to_native_sigset(iss, bss) } void -native_to_ibcs2_sigset(bss, iss) - const sigset_t *bss; - ibcs2_sigset_t *iss; +native_to_ibcs2_sigset(const sigset_t *bss, ibcs2_sigset_t *iss) { int i, newsig; @@ -95,9 +91,7 @@ native_to_ibcs2_sigset(bss, iss) } void -ibcs2_to_native_sigaction(isa, bsa) - const struct ibcs2_sigaction *isa; - struct sigaction *bsa; +ibcs2_to_native_sigaction(const struct ibcs2_sigaction *isa, struct sigaction *bsa) { bsa->sa_handler = isa->ibcs2_sa_handler; @@ -122,9 +116,7 @@ ibcs2_to_native_sigaction(isa, bsa) } void -native_to_ibcs2_sigaction(bsa, isa) - const struct sigaction *bsa; - struct ibcs2_sigaction *isa; +native_to_ibcs2_sigaction(const struct sigaction *bsa, struct ibcs2_sigaction *isa) { isa->ibcs2_sa_handler = bsa->sa_handler; @@ -191,10 +183,7 @@ ibcs2_sys_sigaltstack(struct lwp *l, void *v, register_t *retval) } int -ibcs2_sys_sigsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_sigsys(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_sigsys_args /* { syscallarg(int) sig; @@ -339,10 +328,7 @@ ibcs2_sys_pause(struct lwp *l, void *v, register_t *retval) } int -ibcs2_sys_kill(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_kill(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_kill_args /* { syscallarg(int) pid; diff --git a/sys/compat/ibcs2/ibcs2_socksys.c b/sys/compat/ibcs2/ibcs2_socksys.c index cd9c3c3d965..d921bbcfbf5 100644 --- a/sys/compat/ibcs2/ibcs2_socksys.c +++ b/sys/compat/ibcs2/ibcs2_socksys.c @@ -1,4 +1,4 @@ -/* $NetBSD: ibcs2_socksys.c,v 1.16 2007/03/04 06:01:17 christos Exp $ */ +/* $NetBSD: ibcs2_socksys.c,v 1.17 2007/12/08 18:36:02 dsl Exp $ */ /* * Copyright (c) 1994, 1995 Scott Bartram @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ibcs2_socksys.c,v 1.16 2007/03/04 06:01:17 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ibcs2_socksys.c,v 1.17 2007/12/08 18:36:02 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -57,10 +57,7 @@ struct ibcs2_socksys_args { }; int -ibcs2_socksys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_socksys(struct lwp *l, void *v, register_t *retval) { struct ibcs2_socksys_args *uap = v; int error; diff --git a/sys/compat/ibcs2/ibcs2_stat.c b/sys/compat/ibcs2/ibcs2_stat.c index 659b7bfe2e7..7798602f80f 100644 --- a/sys/compat/ibcs2/ibcs2_stat.c +++ b/sys/compat/ibcs2/ibcs2_stat.c @@ -1,4 +1,4 @@ -/* $NetBSD: ibcs2_stat.c,v 1.41 2007/12/04 18:40:11 dsl Exp $ */ +/* $NetBSD: ibcs2_stat.c,v 1.42 2007/12/08 18:36:02 dsl Exp $ */ /* * Copyright (c) 1995, 1998 Scott Bartram * All rights reserved. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ibcs2_stat.c,v 1.41 2007/12/04 18:40:11 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ibcs2_stat.c,v 1.42 2007/12/08 18:36:02 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -58,9 +58,7 @@ static int cvt_statfs(struct statvfs *, void *, int); static int cvt_statvfs(struct statvfs *, void *, int); static void -bsd_stat2ibcs_stat(st, st4) - struct stat *st; - struct ibcs2_stat *st4; +bsd_stat2ibcs_stat(struct stat *st, struct ibcs2_stat *st4) { memset(st4, 0, sizeof(*st4)); st4->st_dev = (ibcs2_dev_t)st->st_dev; @@ -80,10 +78,7 @@ bsd_stat2ibcs_stat(st, st4) } static int -cvt_statfs(sp, tbuf, len) - struct statvfs *sp; - void *tbuf; - int len; +cvt_statfs(struct statvfs *sp, void *tbuf, int len) { struct ibcs2_statfs ssfs; @@ -106,10 +101,7 @@ cvt_statfs(sp, tbuf, len) } static int -cvt_statvfs(sp, tbuf, len) - struct statvfs *sp; - void *tbuf; - int len; +cvt_statvfs(struct statvfs *sp, void *tbuf, int len) { struct ibcs2_statvfs ssvfs; @@ -243,10 +235,7 @@ ibcs2_sys_fstatvfs(struct lwp *l, void *v, register_t *retval) } int -ibcs2_sys_stat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_stat(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_stat_args /* { syscallarg(const char *) path; @@ -265,10 +254,7 @@ ibcs2_sys_stat(l, v, retval) } int -ibcs2_sys_lstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_lstat(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_lstat_args /* { syscallarg(const char *) path; @@ -288,10 +274,7 @@ ibcs2_sys_lstat(l, v, retval) } int -ibcs2_sys_fstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +ibcs2_sys_fstat(struct lwp *l, void *v, register_t *retval) { struct ibcs2_sys_fstat_args /* { syscallarg(int) fd; diff --git a/sys/compat/irix/irix_dirent.c b/sys/compat/irix/irix_dirent.c index 27b0a65adac..15b40f7025f 100644 --- a/sys/compat/irix/irix_dirent.c +++ b/sys/compat/irix/irix_dirent.c @@ -1,4 +1,4 @@ -/* $NetBSD: irix_dirent.c,v 1.19 2007/03/06 12:43:08 tsutsui Exp $ */ +/* $NetBSD: irix_dirent.c,v 1.20 2007/12/08 18:36:02 dsl Exp $ */ /*- * Copyright (c) 1994, 2001 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: irix_dirent.c,v 1.19 2007/03/06 12:43:08 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: irix_dirent.c,v 1.20 2007/12/08 18:36:02 dsl Exp $"); #include <sys/types.h> #include <sys/signal.h> @@ -71,10 +71,7 @@ __KERNEL_RCSID(0, "$NetBSD: irix_dirent.c,v 1.19 2007/03/06 12:43:08 tsutsui Exp #define SVR4_NAMEOFF(dp) ((char *)&(dp)->d_name - (char *)dp) int -irix_sys_ngetdents(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_ngetdents(struct lwp *l, void *v, register_t *retval) { struct irix_sys_ngetdents_args /* { syscallarg(int) fildes; @@ -203,10 +200,7 @@ out1: } int -irix_sys_getdents(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_getdents(struct lwp *l, void *v, register_t *retval) { struct irix_sys_ngetdents_args /* { syscallarg(int) fildes; @@ -230,10 +224,7 @@ irix_sys_getdents(l, v, retval) * 32 bit versions (only 3 lines of diff) */ int -irix_sys_ngetdents64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_ngetdents64(struct lwp *l, void *v, register_t *retval) { struct irix_sys_ngetdents64_args /* { syscallarg(int) fildes; @@ -361,10 +352,7 @@ out1: } int -irix_sys_getdents64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_getdents64(struct lwp *l, void *v, register_t *retval) { struct irix_sys_ngetdents64_args /* { syscallarg(int) fildes; diff --git a/sys/compat/irix/irix_exec.c b/sys/compat/irix/irix_exec.c index 049d0b6f9b0..d5d83fa3311 100644 --- a/sys/compat/irix/irix_exec.c +++ b/sys/compat/irix/irix_exec.c @@ -1,4 +1,4 @@ -/* $NetBSD: irix_exec.c,v 1.48 2007/12/06 14:53:35 ad Exp $ */ +/* $NetBSD: irix_exec.c,v 1.49 2007/12/08 18:36:02 dsl Exp $ */ /*- * Copyright (c) 2001-2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: irix_exec.c,v 1.48 2007/12/06 14:53:35 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: irix_exec.c,v 1.49 2007/12/08 18:36:02 dsl Exp $"); #ifdef _KERNEL_OPT #include "opt_syscall_debug.h" @@ -129,10 +129,7 @@ const struct emul emul_irix = { * set registers on exec for N32 applications */ void -irix_n32_setregs(l, pack, stack) - struct lwp *l; - struct exec_package *pack; - u_long stack; +irix_n32_setregs(struct lwp *l, struct exec_package *pack, u_long stack) { struct frame *f = (struct frame *)l->l_md.md_regs; @@ -144,9 +141,7 @@ irix_n32_setregs(l, pack, stack) * per-process emuldata allocation */ static void -irix_e_proc_init(p, vmspace) - struct proc *p; - struct vmspace *vmspace; +irix_e_proc_init(struct proc *p, struct vmspace *vmspace) { struct irix_emuldata *ied; vaddr_t vm_min; @@ -169,9 +164,7 @@ irix_e_proc_init(p, vmspace) * exec() hook used to allocate per process structures */ static void -irix_e_proc_exec(p, epp) - struct proc *p; - struct exec_package *epp; +irix_e_proc_exec(struct proc *p, struct exec_package *epp) { int error; @@ -189,8 +182,7 @@ irix_e_proc_exec(p, epp) * exit() hook used to free per process data structures */ static void -irix_e_proc_exit(p) - struct proc *p; +irix_e_proc_exit(struct proc *p) { struct proc *pp; struct irix_emuldata *ied; diff --git a/sys/compat/irix/irix_fcntl.c b/sys/compat/irix/irix_fcntl.c index 2e753d639f6..cd8e57f3814 100644 --- a/sys/compat/irix/irix_fcntl.c +++ b/sys/compat/irix/irix_fcntl.c @@ -1,4 +1,4 @@ -/* $NetBSD: irix_fcntl.c,v 1.19 2007/12/04 18:40:11 dsl Exp $ */ +/* $NetBSD: irix_fcntl.c,v 1.20 2007/12/08 18:36:02 dsl Exp $ */ /*- * Copyright (c) 2001-2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: irix_fcntl.c,v 1.19 2007/12/04 18:40:11 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: irix_fcntl.c,v 1.20 2007/12/08 18:36:02 dsl Exp $"); #include <sys/types.h> #include <sys/signal.h> @@ -73,10 +73,7 @@ static int bsd_to_irix_fcntl_flags(int); static int irix_to_bsd_fcntl_flags(int); int -irix_sys_lseek64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_lseek64(struct lwp *l, void *v, register_t *retval) { /* * Note: we have an alignement problem here. If pad2, pad3 and pad4 @@ -109,10 +106,7 @@ irix_sys_lseek64(l, v, retval) } int -irix_sys_fcntl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_fcntl(struct lwp *l, void *v, register_t *retval) { struct irix_sys_fcntl_args /* { syscallarg(int) fd; @@ -238,12 +232,7 @@ irix_sys_fcntl(l, v, retval) } static int -fd_truncate(l, fd, whence, start, retval) - struct lwp *l; - int fd; - int whence; - off_t start; - register_t *retval; +fd_truncate(struct lwp *l, int fd, int whence, off_t start, register_t *retval) { struct filedesc *fdp = l->l_proc->p_fd; struct file *fp; @@ -284,10 +273,7 @@ fd_truncate(l, fd, whence, start, retval) } int -irix_sys_open(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_open(struct lwp *l, void *v, register_t *retval) { struct irix_sys_open_args /* { syscallarg(char *) path; @@ -354,8 +340,7 @@ irix_sys_open(l, v, retval) } static int -irix_to_bsd_fcntl_flags(flags) - int flags; +irix_to_bsd_fcntl_flags(int flags) { int ret = 0; @@ -381,8 +366,7 @@ irix_to_bsd_fcntl_flags(flags) } static int -bsd_to_irix_fcntl_flags(flags) - int flags; +bsd_to_irix_fcntl_flags(int flags) { int ret = 0; diff --git a/sys/compat/irix/irix_ioctl.c b/sys/compat/irix/irix_ioctl.c index 9d49b7beac2..b93242973ff 100644 --- a/sys/compat/irix/irix_ioctl.c +++ b/sys/compat/irix/irix_ioctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: irix_ioctl.c,v 1.15 2007/11/27 23:30:56 dogcow Exp $ */ +/* $NetBSD: irix_ioctl.c,v 1.16 2007/12/08 18:36:03 dsl Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: irix_ioctl.c,v 1.15 2007/11/27 23:30:56 dogcow Exp $"); +__KERNEL_RCSID(0, "$NetBSD: irix_ioctl.c,v 1.16 2007/12/08 18:36:03 dsl Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -71,10 +71,7 @@ __KERNEL_RCSID(0, "$NetBSD: irix_ioctl.c,v 1.15 2007/11/27 23:30:56 dogcow Exp $ #include <compat/irix/irix_syscallargs.h> int -irix_sys_ioctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_ioctl(struct lwp *l, void *v, register_t *retval) { struct irix_sys_ioctl_args /* { syscallarg(int) fd; diff --git a/sys/compat/irix/irix_kmem.c b/sys/compat/irix/irix_kmem.c index f44f3d5e718..6d0be90cbe4 100644 --- a/sys/compat/irix/irix_kmem.c +++ b/sys/compat/irix/irix_kmem.c @@ -1,4 +1,4 @@ -/* $NetBSD: irix_kmem.c,v 1.6 2005/12/11 12:20:12 christos Exp $ */ +/* $NetBSD: irix_kmem.c,v 1.7 2007/12/08 18:36:03 dsl Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: irix_kmem.c,v 1.6 2005/12/11 12:20:12 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: irix_kmem.c,v 1.7 2007/12/08 18:36:03 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -78,10 +78,7 @@ const struct cdevsw irix_kmem_cdevsw = { }; void -irix_kmemattach(parent, self, aux) - struct device *parent; - struct device *self; - void *aux; +irix_kmemattach(struct device *parent, struct device *self, void *aux) { return; } @@ -96,10 +93,7 @@ irix_kmemopen(dev, flags, fmt, l) } int -irix_kmemread(dev, uio, flag) - dev_t dev; - struct uio *uio; - int flag; +irix_kmemread(dev_t dev, struct uio *uio, int flag) { void *buf = NULL; off_t buflen = 0; @@ -135,10 +129,7 @@ irix_kmemread(dev, uio, flag) } int -irix_kmemwrite(dev, uio, flag) - dev_t dev; - struct uio *uio; - int flag; +irix_kmemwrite(dev_t dev, struct uio *uio, int flag) { return 0; } diff --git a/sys/compat/irix/irix_misc.c b/sys/compat/irix/irix_misc.c index eacffba81d7..65a3f0ba5b0 100644 --- a/sys/compat/irix/irix_misc.c +++ b/sys/compat/irix/irix_misc.c @@ -1,4 +1,4 @@ -/* $NetBSD: irix_misc.c,v 1.9 2007/03/04 06:01:17 christos Exp $ */ +/* $NetBSD: irix_misc.c,v 1.10 2007/12/08 18:36:03 dsl Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: irix_misc.c,v 1.9 2007/03/04 06:01:17 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: irix_misc.c,v 1.10 2007/12/08 18:36:03 dsl Exp $"); #include <sys/types.h> #include <sys/signal.h> @@ -66,10 +66,7 @@ __KERNEL_RCSID(0, "$NetBSD: irix_misc.c,v 1.9 2007/03/04 06:01:17 christos Exp $ * Maybe consider moving this to sys/compat/common/compat_util.c? */ int -irix_sys_setpgrp(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_setpgrp(struct lwp *l, void *v, register_t *retval) { struct irix_sys_setpgrp_args /* { syscallarg(int) pid; @@ -93,10 +90,7 @@ irix_sys_setpgrp(l, v, retval) #define BUF_SIZE 16 int -irix_sys_uname(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_uname(struct lwp *l, void *v, register_t *retval) { struct irix_sys_uname_args /* { syscallarg(struct irix_utsname *) name; @@ -128,10 +122,7 @@ irix_sys_uname(l, v, retval) } int -irix_sys_utssys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_utssys(struct lwp *l, void *v, register_t *retval) { struct irix_sys_utssys_args /* { syscallarg(void *) a1; diff --git a/sys/compat/irix/irix_mman.c b/sys/compat/irix/irix_mman.c index d0e7b814fe2..5db32afc962 100644 --- a/sys/compat/irix/irix_mman.c +++ b/sys/compat/irix/irix_mman.c @@ -1,4 +1,4 @@ -/* $NetBSD: irix_mman.c,v 1.17 2007/12/06 14:53:35 ad Exp $ */ +/* $NetBSD: irix_mman.c,v 1.18 2007/12/08 18:36:03 dsl Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: irix_mman.c,v 1.17 2007/12/06 14:53:35 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: irix_mman.c,v 1.18 2007/12/08 18:36:03 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_sysv.h" @@ -74,10 +74,7 @@ static int irix_mmap(struct lwp *, void *, size_t, int , int, int, off_t, register_t *); int -irix_sys_mmap(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_mmap(struct lwp *l, void *v, register_t *retval) { struct irix_sys_mmap_args /* { syscallarg(void *) addr; @@ -94,10 +91,7 @@ irix_sys_mmap(l, v, retval) } int -irix_sys_mmap64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_mmap64(struct lwp *l, void *v, register_t *retval) { struct irix_sys_mmap64_args /* { syscallarg(void *) addr; @@ -115,15 +109,7 @@ irix_sys_mmap64(l, v, retval) } static int -irix_mmap(l, addr, len, prot, flags, fd, pos, retval) - struct lwp *l; - void *addr; - size_t len; - int prot; - int flags; - int fd; - off_t pos; - register_t *retval; +irix_mmap(struct lwp *l, void *addr, size_t len, int prot, int flags, int fd, off_t pos, register_t *retval) { struct proc *p = l->l_proc; struct sys_mmap_args cup; @@ -241,10 +227,7 @@ out: int -irix_sys_munmap(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_munmap(struct lwp *l, void *v, register_t *retval) { struct irix_sys_munmap_args /* { syscallarg(void *) addr; @@ -262,10 +245,7 @@ irix_sys_munmap(l, v, retval) } int -irix_sys_break(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_break(struct lwp *l, void *v, register_t *retval) { struct proc *p = l->l_proc; int error; @@ -276,10 +256,7 @@ irix_sys_break(l, v, retval) #ifdef SYSVSHM int -irix_sys_shmsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_shmsys(struct lwp *l, void *v, register_t *retval) { struct proc *p = l->l_proc; int error; @@ -290,10 +267,7 @@ irix_sys_shmsys(l, v, retval) #endif int -irix_sys_mprotect(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_mprotect(struct lwp *l, void *v, register_t *retval) { struct proc *p = l->l_proc; int error; diff --git a/sys/compat/irix/irix_mount.c b/sys/compat/irix/irix_mount.c index a4e57846f0c..e5c79d84700 100644 --- a/sys/compat/irix/irix_mount.c +++ b/sys/compat/irix/irix_mount.c @@ -1,4 +1,4 @@ -/* $NetBSD: irix_mount.c,v 1.18 2007/11/28 10:34:37 he Exp $ */ +/* $NetBSD: irix_mount.c,v 1.19 2007/12/08 18:36:03 dsl Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: irix_mount.c,v 1.18 2007/11/28 10:34:37 he Exp $"); +__KERNEL_RCSID(0, "$NetBSD: irix_mount.c,v 1.19 2007/12/08 18:36:03 dsl Exp $"); #include <sys/types.h> #include <sys/signal.h> @@ -58,10 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: irix_mount.c,v 1.18 2007/11/28 10:34:37 he Exp $"); #include <compat/irix/irix_syscallargs.h> int -irix_sys_getmountid(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_getmountid(struct lwp *l, void *v, register_t *retval) { struct irix_sys_getmountid_args /* { syscallarg(const char *) path; diff --git a/sys/compat/irix/irix_prctl.c b/sys/compat/irix/irix_prctl.c index 94637581f90..a44ced6ea43 100644 --- a/sys/compat/irix/irix_prctl.c +++ b/sys/compat/irix/irix_prctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: irix_prctl.c,v 1.42 2007/12/06 14:53:35 ad Exp $ */ +/* $NetBSD: irix_prctl.c,v 1.43 2007/12/08 18:36:03 dsl Exp $ */ /*- * Copyright (c) 2001-2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: irix_prctl.c,v 1.42 2007/12/06 14:53:35 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: irix_prctl.c,v 1.43 2007/12/08 18:36:03 dsl Exp $"); #include <sys/errno.h> #include <sys/types.h> @@ -89,10 +89,7 @@ static void irix_isrr_debug(struct proc *); static void irix_isrr_cleanup(struct proc *); int -irix_sys_prctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_prctl(struct lwp *l, void *v, register_t *retval) { struct irix_sys_prctl_args /* { syscallarg(unsigned) option; @@ -209,10 +206,7 @@ irix_sys_prctl(l, v, retval) int -irix_sys_pidsprocsp(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_pidsprocsp(struct lwp *l, void *v, register_t *retval) { struct irix_sys_pidsprocsp_args /* { syscallarg(void *) entry; @@ -231,10 +225,7 @@ irix_sys_pidsprocsp(l, v, retval) } int -irix_sys_sprocsp(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_sprocsp(struct lwp *l, void *v, register_t *retval) { struct irix_sys_sprocsp_args /* { syscallarg(void *) entry; @@ -249,10 +240,7 @@ irix_sys_sprocsp(l, v, retval) } int -irix_sys_sproc(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_sproc(struct lwp *l, void *v, register_t *retval) { struct irix_sys_sproc_args /* { syscallarg(void *) entry; @@ -267,15 +255,7 @@ irix_sys_sproc(l, v, retval) static int -irix_sproc(entry, inh, arg, sp, len, pid, l, retval) - void *entry; - unsigned int inh; - void *arg; - void *sp; - size_t len; - pid_t pid; - struct lwp *l; - register_t *retval; +irix_sproc(void *entry, unsigned int inh, void *arg, void *sp, size_t len, pid_t pid, struct lwp *l, register_t *retval) { struct proc *p = l->l_proc; int bsd_flags = 0; @@ -416,8 +396,7 @@ irix_sproc(entry, inh, arg, sp, len, pid, l, retval) } static void -irix_sproc_child(isc) - struct irix_sproc_child_args *isc; +irix_sproc_child(struct irix_sproc_child_args *isc) { struct proc *p2 = *isc->isc_proc; struct lwp *l2 = curlwp; @@ -544,10 +523,7 @@ irix_sproc_child(isc) } int -irix_sys_procblk(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_procblk(struct lwp *l, void *v, register_t *retval) { struct irix_sys_procblk_args /* { syscallarg(int) cmd; @@ -651,8 +627,7 @@ irix_sys_procblk(l, v, retval) } int -irix_prda_init(p) - struct proc *p; +irix_prda_init(struct proc *p) { int error; struct exec_vmcmd evc; @@ -692,10 +667,7 @@ irix_prda_init(p) } int -irix_vm_fault(p, vaddr, access_type) - struct proc *p; - vaddr_t vaddr; - vm_prot_t access_type; +irix_vm_fault(struct proc *p, vaddr_t vaddr, vm_prot_t access_type) { int error; struct irix_emuldata *ied; @@ -720,8 +692,7 @@ irix_vm_fault(p, vaddr, access_type) * Propagate changes to address space to other members of the share group */ void -irix_vm_sync(p) - struct proc *p; +irix_vm_sync(struct proc *p) { struct proc *pp; struct irix_emuldata *iedp; @@ -774,10 +745,7 @@ irix_vm_sync(p) } static struct irix_shared_regions_rec * -irix_isrr_create(start, len, shared) - vaddr_t start; - vsize_t len; - int shared; +irix_isrr_create(vaddr_t start, vsize_t len, int shared) { struct irix_shared_regions_rec *new_isrr; @@ -795,11 +763,7 @@ irix_isrr_create(start, len, shared) * overlaping or be included in an existing region. */ void -irix_isrr_insert(start, len, shared, p) - vaddr_t start; - vsize_t len; - int shared; - struct proc *p; +irix_isrr_insert(vaddr_t start, vsize_t len, int shared, struct proc *p) { struct irix_emuldata *ied = (struct irix_emuldata *)p->p_emuldata; struct irix_shared_regions_rec *isrr; @@ -917,8 +881,7 @@ irix_isrr_insert(start, len, shared, p) * (2) merging contiguous regions with the same status */ static void -irix_isrr_cleanup(p) - struct proc *p; +irix_isrr_cleanup(struct proc *p) { struct irix_emuldata *ied = (struct irix_emuldata *)p->p_emuldata; struct irix_shared_regions_rec *isrr; @@ -953,8 +916,7 @@ irix_isrr_cleanup(p) #ifdef DEBUG_IRIX static void -irix_isrr_debug(p) - struct proc *p; +irix_isrr_debug(struct proc *p) { struct irix_emuldata *ied = (struct irix_emuldata *)p->p_emuldata; struct irix_shared_regions_rec *isrr; diff --git a/sys/compat/irix/irix_resource.c b/sys/compat/irix/irix_resource.c index 238306821d6..3f37864517a 100644 --- a/sys/compat/irix/irix_resource.c +++ b/sys/compat/irix/irix_resource.c @@ -1,4 +1,4 @@ -/* $NetBSD: irix_resource.c,v 1.11 2007/12/04 18:40:12 dsl Exp $ */ +/* $NetBSD: irix_resource.c,v 1.12 2007/12/08 18:36:03 dsl Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: irix_resource.c,v 1.11 2007/12/04 18:40:12 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: irix_resource.c,v 1.12 2007/12/08 18:36:03 dsl Exp $"); #include <sys/types.h> #include <sys/signal.h> @@ -59,8 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: irix_resource.c,v 1.11 2007/12/04 18:40:12 dsl Exp $ static int irix_to_native_resource(int); static int -irix_to_native_resource(irix_res) - int irix_res; +irix_to_native_resource(int irix_res) { int bsd_res; @@ -97,10 +96,7 @@ irix_to_native_resource(irix_res) } int -irix_sys_getrlimit(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_getrlimit(struct lwp *l, void *v, register_t *retval) { struct irix_sys_getrlimit_args /* { syscallarg(int) resource; @@ -130,10 +126,7 @@ irix_sys_getrlimit(l, v, retval) } int -irix_sys_getrlimit64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_getrlimit64(struct lwp *l, void *v, register_t *retval) { struct irix_sys_getrlimit64_args /* { syscallarg(int) resource; @@ -163,10 +156,7 @@ irix_sys_getrlimit64(l, v, retval) } int -irix_sys_setrlimit(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_setrlimit(struct lwp *l, void *v, register_t *retval) { struct irix_sys_getrlimit_args /* { syscallarg(int) resource; @@ -198,10 +188,7 @@ irix_sys_setrlimit(l, v, retval) } int -irix_sys_setrlimit64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_setrlimit64(struct lwp *l, void *v, register_t *retval) { struct irix_sys_getrlimit_args /* { syscallarg(int) resource; diff --git a/sys/compat/irix/irix_signal.c b/sys/compat/irix/irix_signal.c index d88a3a42012..5561783aa40 100644 --- a/sys/compat/irix/irix_signal.c +++ b/sys/compat/irix/irix_signal.c @@ -1,4 +1,4 @@ -/* $NetBSD: irix_signal.c,v 1.44 2007/12/04 18:40:12 dsl Exp $ */ +/* $NetBSD: irix_signal.c,v 1.45 2007/12/08 18:36:04 dsl Exp $ */ /*- * Copyright (c) 1994, 2001-2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: irix_signal.c,v 1.44 2007/12/04 18:40:12 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: irix_signal.c,v 1.45 2007/12/08 18:36:04 dsl Exp $"); #include <sys/types.h> #include <sys/signal.h> @@ -140,11 +140,7 @@ irix_wait_siginfo(int pid, struct rusage *ru, int st, struct irix_irix5_siginfo * Build a struct siginfo for signal delivery */ static void -irix_signal_siginfo(isi, sig, code, addr) - struct irix_irix5_siginfo *isi; - int sig; - u_long code; - void *addr; +irix_signal_siginfo(struct irix_irix5_siginfo *isi, int sig, u_long code, void *addr) { if (sig < 0 || sig >= SVR4_NSIG) { isi->isi_errno = IRIX_EINVAL; @@ -221,9 +217,7 @@ irix_signal_siginfo(isi, sig, code, addr) } void -native_to_irix_sigset(bss, sss) - const sigset_t *bss; - irix_sigset_t *sss; +native_to_irix_sigset(const sigset_t *bss, irix_sigset_t *sss) { int i, newsig; @@ -238,9 +232,7 @@ native_to_irix_sigset(bss, sss) } void -irix_to_native_sigset(sss, bss) - const irix_sigset_t *sss; - sigset_t *bss; +irix_to_native_sigset(const irix_sigset_t *sss, sigset_t *bss) { int i, newsig; @@ -443,11 +435,7 @@ irix_set_sigcontext (scp, mask, code, l) } void -irix_set_ucontext(ucp, mask, code, l) - struct irix_ucontext *ucp; - const sigset_t *mask; - int code; - struct lwp *l; +irix_set_ucontext(struct irix_ucontext *ucp, const sigset_t *mask, int code, struct lwp *l) { struct frame *f; @@ -514,10 +502,7 @@ irix_set_ucontext(ucp, mask, code, l) } int -irix_sys_sigreturn(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_sigreturn(struct lwp *l, void *v, register_t *retval) { struct irix_sys_sigreturn_args /* { syscallarg(struct irix_sigcontext *) scp; @@ -573,9 +558,7 @@ irix_sys_sigreturn(l, v, retval) } static void -irix_get_ucontext(ucp, l) - struct irix_ucontext *ucp; - struct lwp *l; +irix_get_ucontext(struct irix_ucontext *ucp, struct lwp *l) { struct frame *f; sigset_t mask; @@ -646,9 +629,7 @@ irix_get_ucontext(ucp, l) } static void -irix_get_sigcontext(scp, l) - struct irix_sigcontext *scp; - struct lwp *l; +irix_get_sigcontext(struct irix_sigcontext *scp, struct lwp *l) { int i; struct frame *f; @@ -696,10 +677,7 @@ irix_get_sigcontext(scp, l) int -irix_sys_sginap(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_sginap(struct lwp *l, void *v, register_t *retval) { struct irix_sys_sginap_args /* { syscallarg(long) ticks; @@ -727,10 +705,7 @@ irix_sys_sginap(l, v, retval) * XXX Untested. Expect bugs and security problems here */ int -irix_sys_getcontext(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_getcontext(struct lwp *l, void *v, register_t *retval) { struct irix_sys_getcontext_args /* { syscallarg(struct irix_ucontext *) ucp; @@ -774,10 +749,7 @@ irix_sys_getcontext(l, v, retval) * XXX Untested. Expect bugs and security problems here */ int -irix_sys_setcontext(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_setcontext(struct lwp *l, void *v, register_t *retval) { struct irix_sys_setcontext_args /* { syscallarg(struct irix_ucontext *) ucp; @@ -839,10 +811,7 @@ out: * from svr4_misc.c, or push the irix_irix5_siginfo into svr4_siginfo.h */ int -irix_sys_waitsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_waitsys(struct lwp *l, void *v, register_t *retval) { struct irix_sys_waitsys_args /* { syscallarg(int) type; @@ -906,10 +875,7 @@ irix_sys_waitsys(l, v, retval) } int -irix_sys_sigprocmask(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_sigprocmask(struct lwp *l, void *v, register_t *retval) { struct irix_sys_sigprocmask_args /* { syscallarg(int) how; @@ -955,10 +921,7 @@ irix_sys_sigprocmask(l, v, retval) } int -irix_sys_sigaction(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_sigaction(struct lwp *l, void *v, register_t *retval) { struct irix_sys_sigaction_args /* { syscallarg(int) signum; diff --git a/sys/compat/irix/irix_stat.c b/sys/compat/irix/irix_stat.c index f41be3abd30..19ab6828013 100644 --- a/sys/compat/irix/irix_stat.c +++ b/sys/compat/irix/irix_stat.c @@ -1,4 +1,4 @@ -/* $NetBSD: irix_stat.c,v 1.20 2007/12/04 18:40:12 dsl Exp $ */ +/* $NetBSD: irix_stat.c,v 1.21 2007/12/08 18:36:04 dsl Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: irix_stat.c,v 1.20 2007/12/04 18:40:12 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: irix_stat.c,v 1.21 2007/12/08 18:36:04 dsl Exp $"); #include <sys/errno.h> #include <sys/types.h> @@ -66,9 +66,7 @@ static void bsd_to_irix_stat(struct stat *, struct irix_stat *); static void bsd_to_irix_stat64(struct stat *, struct irix_stat64 *); static void -bsd_to_irix_stat(bsp, isp) - struct stat *bsp; - struct irix_stat *isp; +bsd_to_irix_stat(struct stat *bsp, struct irix_stat *isp) { memset(isp, 0, sizeof(*isp)); isp->ist_dev = (irix_dev_t)bsd_to_svr4_dev_t(bsp->st_dev); @@ -98,9 +96,7 @@ bsd_to_irix_stat(bsp, isp) } static void -bsd_to_irix_stat64(bsp, isp) - struct stat *bsp; - struct irix_stat64 *isp; +bsd_to_irix_stat64(struct stat *bsp, struct irix_stat64 *isp) { memset(isp, 0, sizeof(*isp)); isp->ist_dev = (irix_dev_t)bsd_to_svr4_dev_t(bsp->st_dev); @@ -154,10 +150,7 @@ convert_irix_stat(struct stat *st, void *buf, int stat_version) } int -irix_sys_xstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_xstat(struct lwp *l, void *v, register_t *retval) { struct irix_sys_xstat_args /* { syscallarg(const int) version; @@ -175,10 +168,7 @@ irix_sys_xstat(l, v, retval) } int -irix_sys_lxstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_lxstat(struct lwp *l, void *v, register_t *retval) { struct irix_sys_lxstat_args /* { syscallarg(const int) version; @@ -195,10 +185,7 @@ irix_sys_lxstat(l, v, retval) } int -irix_sys_fxstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_fxstat(struct lwp *l, void *v, register_t *retval) { struct irix_sys_fxstat_args /* { syscallarg(const int) version; diff --git a/sys/compat/irix/irix_swap.c b/sys/compat/irix/irix_swap.c index c01ab387e5a..f023b32c70e 100644 --- a/sys/compat/irix/irix_swap.c +++ b/sys/compat/irix/irix_swap.c @@ -1,4 +1,4 @@ -/* $NetBSD: irix_swap.c,v 1.18 2007/03/06 12:43:09 tsutsui Exp $ */ +/* $NetBSD: irix_swap.c,v 1.19 2007/12/08 18:36:04 dsl Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: irix_swap.c,v 1.18 2007/03/06 12:43:09 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: irix_swap.c,v 1.19 2007/12/08 18:36:04 dsl Exp $"); #include <sys/types.h> #include <sys/signal.h> @@ -63,10 +63,7 @@ __KERNEL_RCSID(0, "$NetBSD: irix_swap.c,v 1.18 2007/03/06 12:43:09 tsutsui Exp $ #include <compat/irix/irix_syscallargs.h> int -irix_sys_swapctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_swapctl(struct lwp *l, void *v, register_t *retval) { struct irix_sys_swapctl_args /* { syscallarg(int) cmd; diff --git a/sys/compat/irix/irix_sysmp.c b/sys/compat/irix/irix_sysmp.c index f6f280899ce..fe6349ecde7 100644 --- a/sys/compat/irix/irix_sysmp.c +++ b/sys/compat/irix/irix_sysmp.c @@ -1,4 +1,4 @@ -/* $NetBSD: irix_sysmp.c,v 1.18 2007/12/04 18:40:12 dsl Exp $ */ +/* $NetBSD: irix_sysmp.c,v 1.19 2007/12/08 18:36:04 dsl Exp $ */ /*- * Copyright (c) 2001-2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: irix_sysmp.c,v 1.18 2007/12/04 18:40:12 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: irix_sysmp.c,v 1.19 2007/12/08 18:36:04 dsl Exp $"); #include <sys/errno.h> #include <sys/param.h> @@ -69,10 +69,7 @@ extern struct loadavg averunnable; extern long irix_kernel_var[32]; int -irix_sys_sysmp(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_sysmp(struct lwp *l, void *v, register_t *retval) { struct irix_sys_sysmp_args /* { syscallarg(int) cmd; @@ -122,9 +119,7 @@ irix_sys_sysmp(l, v, retval) } static int -irix_sysmp_kernaddr(kernaddr, retval) - int kernaddr; - register_t *retval; +irix_sysmp_kernaddr(int kernaddr, register_t *retval) { switch (kernaddr) { case IRIX_MPKA_AVENRUN: @@ -146,9 +141,7 @@ irix_sysmp_kernaddr(kernaddr, retval) } static int -irix_sysmp_sasz(cmd, retval) - int cmd; - register_t *retval; +irix_sysmp_sasz(int cmd, register_t *retval) { switch (cmd) { case IRIX_MPSA_RMINFO: @@ -164,10 +157,7 @@ irix_sysmp_sasz(cmd, retval) } static int -irix_sysmp_saget(cmd, buf, len) - int cmd; - char *buf; - size_t len; +irix_sysmp_saget(int cmd, char *buf, size_t len) { extern u_int bufpages; void *kbuf; diff --git a/sys/compat/irix/irix_syssgi.c b/sys/compat/irix/irix_syssgi.c index e23ac3dcf59..22ebcd8ba9b 100644 --- a/sys/compat/irix/irix_syssgi.c +++ b/sys/compat/irix/irix_syssgi.c @@ -1,4 +1,4 @@ -/* $NetBSD: irix_syssgi.c,v 1.44 2007/12/04 18:40:13 dsl Exp $ */ +/* $NetBSD: irix_syssgi.c,v 1.45 2007/12/08 18:36:04 dsl Exp $ */ /*- * Copyright (c) 2001-2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: irix_syssgi.c,v 1.44 2007/12/04 18:40:13 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: irix_syssgi.c,v 1.45 2007/12/08 18:36:04 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_ddb.h" @@ -91,10 +91,7 @@ static int irix_syssgi_sysconf(int name, struct lwp *, register_t *); static int irix_syssgi_pathconf(char *, int, struct lwp *, register_t *); int -irix_sys_syssgi(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_syssgi(struct lwp *l, void *v, register_t *retval) { struct irix_sys_syssgi_args /* { syscallarg(int) request; @@ -285,12 +282,7 @@ irix_sys_syssgi(l, v, retval) } static int -irix_syssgi_mapelf(fd, ph, count, l, retval) - int fd; - Elf_Phdr *ph; - int count; - struct lwp *l; - register_t *retval; +irix_syssgi_mapelf(int fd, Elf_Phdr *ph, int count, struct lwp *l, register_t *retval) { Elf_Phdr *kph; Elf_Phdr *pht; @@ -452,10 +444,7 @@ bad: static int -irix_syssgi_sysconf(name, l, retval) - int name; - struct lwp *l; - register_t *retval; +irix_syssgi_sysconf(int name, struct lwp *l, register_t *retval) { struct proc *p = l->l_proc; int error = 0; @@ -526,11 +515,7 @@ irix_syssgi_sysconf(name, l, retval) } static int -irix_syssgi_pathconf(path, name, l, retval) - char *path; - int name; - struct lwp *l; - register_t *retval; +irix_syssgi_pathconf(char *path, int name, struct lwp *l, register_t *retval) { struct sys_pathconf_args cup; int bname; diff --git a/sys/compat/irix/irix_systeminfo.c b/sys/compat/irix/irix_systeminfo.c index 1bd9fc38ab8..2c0f0bac6a4 100644 --- a/sys/compat/irix/irix_systeminfo.c +++ b/sys/compat/irix/irix_systeminfo.c @@ -1,4 +1,4 @@ -/* $NetBSD: irix_systeminfo.c,v 1.13 2007/02/15 20:32:48 ad Exp $ */ +/* $NetBSD: irix_systeminfo.c,v 1.14 2007/12/08 18:36:04 dsl Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: irix_systeminfo.c,v 1.13 2007/02/15 20:32:48 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: irix_systeminfo.c,v 1.14 2007/12/08 18:36:04 dsl Exp $"); #include <sys/types.h> #include <sys/signal.h> @@ -76,10 +76,7 @@ char irix_si_version[128] = "04131232"; #define BUF_SIZE 16 int -irix_sys_systeminfo(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_systeminfo(struct lwp *l, void *v, register_t *retval) { struct irix_sys_systeminfo_args /* { syscallarg(int) what; diff --git a/sys/compat/irix/irix_usema.c b/sys/compat/irix/irix_usema.c index dd495cb32b9..82274599be8 100644 --- a/sys/compat/irix/irix_usema.c +++ b/sys/compat/irix/irix_usema.c @@ -1,4 +1,4 @@ -/* $NetBSD: irix_usema.c,v 1.24 2007/12/06 14:53:36 ad Exp $ */ +/* $NetBSD: irix_usema.c,v 1.25 2007/12/08 18:36:04 dsl Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: irix_usema.c,v 1.24 2007/12/06 14:53:36 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: irix_usema.c,v 1.25 2007/12/08 18:36:04 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -155,10 +155,7 @@ struct irix_usema_softc { * and attach the dummy filesystem we need to use custom vnode operations. */ void -irix_usemaattach(parent, self, aux) - struct device *parent; - struct device *self; - void *aux; +irix_usemaattach(struct device *parent, struct device *self, void *aux) { int error; @@ -174,8 +171,7 @@ irix_usemaattach(parent, self, aux) * vnode operations on the device */ int -irix_usema_ioctl(v) - void *v; +irix_usema_ioctl(void *v) { struct vop_ioctl_args /* { struct vnode *a_vp; @@ -264,8 +260,7 @@ irix_usema_ioctl(v) int -irix_usema_poll(v) - void *v; +irix_usema_poll(void *v) { struct vop_poll_args /* { struct vnode *a_vp; @@ -292,8 +287,7 @@ irix_usema_poll(v) } int -irix_usema_close(v) - void *v; +irix_usema_close(void *v) { struct vop_close_args /* { struct vnode *a_vp; @@ -335,8 +329,7 @@ irix_usema_close(v) * but still return 0 in case of failure (IRIX libc rely on this). */ int -irix_usema_setattr(v) - void *v; +irix_usema_setattr(void *v) { struct vop_setattr_args /* { struct vnode *a_vp; @@ -356,8 +349,7 @@ irix_usema_setattr(v) } int -irix_usema_inactive(v) - void *v; +irix_usema_inactive(void *v) { struct vop_inactive_args /* { struct vnode *a_vp; @@ -401,10 +393,7 @@ IRIX_USEMA_VNOP_WRAP(fcntl) * but it is closely related to it. */ int -irix_sys_usync_cntl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +irix_sys_usync_cntl(struct lwp *l, void *v, register_t *retval) { struct irix_sys_usync_cntl_args /* { syscallarg(int) cmd; @@ -490,8 +479,7 @@ irix_sys_usync_cntl(l, v, retval) /* Operations on irix_usema_reclist */ static struct irix_usema_rec * -iur_lookup_by_vn(vp) - struct vnode *vp; +iur_lookup_by_vn(struct vnode *vp) { struct irix_usema_rec *iur; @@ -504,8 +492,7 @@ iur_lookup_by_vn(vp) } static struct irix_usema_rec * -iur_lookup_by_sem(sem) - struct irix_semaphore *sem; +iur_lookup_by_sem(struct irix_semaphore *sem) { struct irix_usema_rec *iur; struct irix_semaphore is; @@ -524,10 +511,7 @@ iur_lookup_by_sem(sem) } static struct irix_usema_rec * -iur_insert(sem, vp, p) - struct irix_semaphore *sem; - struct vnode *vp; - struct proc *p; +iur_insert(struct irix_semaphore *sem, struct vnode *vp, struct proc *p) { struct irix_usema_rec *iur; struct irix_semaphore is; @@ -555,8 +539,7 @@ iur_insert(sem, vp, p) } static void -iur_remove(iur) - struct irix_usema_rec *iur; +iur_remove(struct irix_usema_rec *iur) { struct irix_waiting_proc_rec *iwpr; @@ -588,9 +571,7 @@ released_restart: } static struct irix_waiting_proc_rec * -iur_proc_queue(iur, p) - struct irix_usema_rec *iur; - struct proc *p; +iur_proc_queue(struct irix_usema_rec *iur, struct proc *p) { struct irix_waiting_proc_rec *iwpr; @@ -614,9 +595,7 @@ got_iwpr: } static void -iur_proc_dequeue(iur, iwpr) - struct irix_usema_rec *iur; - struct irix_waiting_proc_rec *iwpr; +iur_proc_dequeue(struct irix_usema_rec *iur, struct irix_waiting_proc_rec *iwpr) { rw_enter(&iur->iur_lock, RW_WRITER); iur->iur_waiting_count--; @@ -627,9 +606,7 @@ iur_proc_dequeue(iur, iwpr) } static void -iur_proc_release(iur, iwpr) - struct irix_usema_rec *iur; - struct irix_waiting_proc_rec *iwpr; +iur_proc_release(struct irix_usema_rec *iur, struct irix_waiting_proc_rec *iwpr) { rw_enter(&iur->iur_lock, RW_WRITER); iur->iur_waiting_count--; @@ -641,9 +618,7 @@ iur_proc_release(iur, iwpr) static int -iur_proc_isreleased(iur, p) - struct irix_usema_rec *iur; - struct proc *p; +iur_proc_isreleased(struct irix_usema_rec *iur, struct proc *p) { struct irix_waiting_proc_rec *iwpr; int res = 0; @@ -660,8 +635,7 @@ iur_proc_isreleased(iur, p) } static struct irix_waiting_proc_rec * -iur_proc_getfirst(iur) - struct irix_usema_rec *iur; +iur_proc_getfirst(struct irix_usema_rec *iur) { struct irix_waiting_proc_rec *iwpr; @@ -677,9 +651,7 @@ iur_proc_getfirst(iur) * otherwise change ownership of structure allocated for process p to new_p */ void -irix_usema_exit_cleanup(p, new_p) - struct proc *p; - struct proc *new_p; +irix_usema_exit_cleanup(struct proc *p, struct proc *new_p) { struct irix_usema_rec *iur; diff --git a/sys/compat/linux/arch/alpha/linux_machdep.c b/sys/compat/linux/arch/alpha/linux_machdep.c index 14489a12c6c..2cb1dbd4dd1 100644 --- a/sys/compat/linux/arch/alpha/linux_machdep.c +++ b/sys/compat/linux/arch/alpha/linux_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_machdep.c,v 1.39 2007/07/08 09:41:00 pooka Exp $ */ +/* $NetBSD: linux_machdep.c,v 1.40 2007/12/08 18:36:05 dsl Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.39 2007/07/08 09:41:00 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.40 2007/12/08 18:36:05 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -99,10 +99,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.39 2007/07/08 09:41:00 pooka Exp */ void -linux_setregs(l, epp, stack) - struct lwp *l; - struct exec_package *epp; - u_long stack; +linux_setregs(struct lwp *l, struct exec_package *epp, u_long stack) { #ifdef DEBUG struct trapframe *tfp = l->l_md.md_tf; @@ -430,10 +427,7 @@ linux_restore_sigcontext(struct lwp *l, struct linux_sigcontext context, } int -linux_sys_rt_sigreturn(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_rt_sigreturn(struct lwp *l, void *v, register_t *retval) { struct linux_sys_rt_sigreturn_args /* { syscallarg(struct linux_rt_sigframe *) sfp; @@ -467,10 +461,7 @@ linux_sys_rt_sigreturn(l, v, retval) int -linux_sys_sigreturn(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_sigreturn(struct lwp *l, void *v, register_t *retval) { struct linux_sys_sigreturn_args /* { syscallarg(struct linux_sigframe *) sfp; @@ -506,10 +497,7 @@ linux_sys_sigreturn(l, v, retval) */ /* XXX XAX update this, add maps, etc... */ int -linux_machdepioctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_machdepioctl(struct lwp *l, void *v, register_t *retval) { struct linux_sys_ioctl_args /* { syscallarg(int) fd; @@ -534,9 +522,7 @@ linux_machdepioctl(l, v, retval) /* XXX XAX fix this */ dev_t -linux_fakedev(dev, raw) - dev_t dev; - int raw; +linux_fakedev(dev_t dev, int raw) { return dev; } diff --git a/sys/compat/linux/arch/alpha/linux_pipe.c b/sys/compat/linux/arch/alpha/linux_pipe.c index b0664a6b673..c603a01312a 100644 --- a/sys/compat/linux/arch/alpha/linux_pipe.c +++ b/sys/compat/linux/arch/alpha/linux_pipe.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_pipe.c,v 1.10 2007/02/09 21:55:18 ad Exp $ */ +/* $NetBSD: linux_pipe.c,v 1.11 2007/12/08 18:36:05 dsl Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_pipe.c,v 1.10 2007/02/09 21:55:18 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_pipe.c,v 1.11 2007/12/08 18:36:05 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -65,10 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_pipe.c,v 1.10 2007/02/09 21:55:18 ad Exp $"); 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) { int error; diff --git a/sys/compat/linux/arch/amd64/linux_machdep.c b/sys/compat/linux/arch/amd64/linux_machdep.c index 6eff484f479..994ec7a56e1 100644 --- a/sys/compat/linux/arch/amd64/linux_machdep.c +++ b/sys/compat/linux/arch/amd64/linux_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_machdep.c,v 1.25 2007/10/19 18:52:10 njoly Exp $ */ +/* $NetBSD: linux_machdep.c,v 1.26 2007/12/08 18:36:05 dsl Exp $ */ /*- * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved. @@ -33,7 +33,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.25 2007/10/19 18:52:10 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.26 2007/12/08 18:36:05 dsl Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -132,9 +132,7 @@ linux_setregs(l, epp, stack) } void -linux_sendsig(ksi, mask) - const ksiginfo_t *ksi; - const sigset_t *mask; +linux_sendsig(const ksiginfo_t *ksi, const sigset_t *mask) { struct lwp *l = curlwp; struct proc *p = l->l_proc; @@ -357,9 +355,7 @@ linux_sys_ioperm(l, v, retval) } dev_t -linux_fakedev(dev, raw) - dev_t dev; - int raw; +linux_fakedev(dev_t dev, int raw) { extern const struct cdevsw ptc_cdevsw, pts_cdevsw; @@ -516,10 +512,7 @@ linux_sys_rt_sigreturn(l, v, retval) } int -linux_sys_arch_prctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_arch_prctl(struct lwp *l, void *v, register_t *retval) { struct linux_sys_arch_prctl_args /* { syscallarg(int) code; @@ -659,8 +652,7 @@ linux_buildcontext(struct lwp *l, void *catcher, void *f) } void * -linux_get_newtls(l) - struct lwp *l; +linux_get_newtls(struct lwp *l) { struct trapframe *tf = l->l_md.md_regs; @@ -668,9 +660,7 @@ linux_get_newtls(l) } int -linux_set_newtls(l, tls) - struct lwp *l; - void *tls; +linux_set_newtls(struct lwp *l, void *tls) { struct linux_sys_arch_prctl_args cup; register_t retval; diff --git a/sys/compat/linux/arch/arm/linux_machdep.c b/sys/compat/linux/arch/arm/linux_machdep.c index 0ad586e6c29..a2b9d3521dd 100644 --- a/sys/compat/linux/arch/arm/linux_machdep.c +++ b/sys/compat/linux/arch/arm/linux_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_machdep.c,v 1.22 2007/03/26 22:44:40 hubertf Exp $ */ +/* $NetBSD: linux_machdep.c,v 1.23 2007/12/08 18:36:05 dsl Exp $ */ /*- * Copyright (c) 1995, 2000 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.22 2007/03/26 22:44:40 hubertf Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.23 2007/12/08 18:36:05 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -75,10 +75,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.22 2007/03/26 22:44:40 hubertf E #include <compat/linux/linux_syscallargs.h> void -linux_setregs(l, epp, stack) - struct lwp *l; - struct exec_package *epp; - u_long stack; +linux_setregs(struct lwp *l, struct exec_package *epp, u_long stack) { setregs(l, epp, stack); @@ -195,10 +192,7 @@ linux_sendsig(const ksiginfo_t *ksi, const sigset_t *mask) * a machine fault. */ int -linux_sys_rt_sigreturn(p, v, retval) - struct proc *p; - void *v; - register_t *retval; +linux_sys_rt_sigreturn(struct proc *p, void *v, register_t *retval) { /* XXX XAX write me */ return(ENOSYS); @@ -206,10 +200,7 @@ linux_sys_rt_sigreturn(p, v, retval) #endif int -linux_sys_sigreturn(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_sigreturn(struct lwp *l, void *v, register_t *retval) { struct linux_sigframe *sfp, frame; struct proc *p = l->l_proc; @@ -273,9 +264,7 @@ linux_sys_sigreturn(l, v, retval) * major device numbers remapping */ dev_t -linux_fakedev(dev, raw) - dev_t dev; - int raw; +linux_fakedev(dev_t dev, int raw) { /* XXX write me */ return dev; @@ -285,10 +274,7 @@ linux_fakedev(dev, raw) * We come here in a last attempt to satisfy a Linux ioctl() call */ int -linux_machdepioctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_machdepioctl(struct lwp *l, void *v, register_t *retval) { struct linux_sys_ioctl_args /* { syscallarg(int) fd; diff --git a/sys/compat/linux/arch/arm/linux_ptrace.c b/sys/compat/linux/arch/arm/linux_ptrace.c index 08456d7ab17..cb060cb8610 100644 --- a/sys/compat/linux/arch/arm/linux_ptrace.c +++ b/sys/compat/linux/arch/arm/linux_ptrace.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_ptrace.c,v 1.9 2007/03/04 06:01:19 christos Exp $ */ +/* $NetBSD: linux_ptrace.c,v 1.10 2007/12/08 18:36:05 dsl Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.9 2007/03/04 06:01:19 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.10 2007/12/08 18:36:05 dsl Exp $"); #include <sys/param.h> #include <sys/malloc.h> @@ -95,10 +95,7 @@ struct linux_reg { #define LINUX_REG_ORIG_R0 17 int -linux_sys_ptrace_arch(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_ptrace_arch(struct lwp *l, void *v, register_t *retval) { struct linux_sys_ptrace_args /* { syscallarg(int) request; diff --git a/sys/compat/linux/arch/i386/linux_machdep.c b/sys/compat/linux/arch/i386/linux_machdep.c index 74a76b270dd..9901aebf2d0 100644 --- a/sys/compat/linux/arch/i386/linux_machdep.c +++ b/sys/compat/linux/arch/i386/linux_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_machdep.c,v 1.131 2007/12/04 18:40:13 dsl Exp $ */ +/* $NetBSD: linux_machdep.c,v 1.132 2007/12/08 18:36:05 dsl Exp $ */ /*- * Copyright (c) 1995, 2000 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.131 2007/12/04 18:40:13 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.132 2007/12/08 18:36:05 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_vm86.h" @@ -130,10 +130,7 @@ extern char linux_sigcode[], linux_rt_sigcode[]; */ void -linux_setregs(l, epp, stack) - struct lwp *l; - struct exec_package *epp; - u_long stack; +linux_setregs(struct lwp *l, struct exec_package *epp, u_long stack) { struct pcb *pcb = &l->l_addr->u_pcb; struct trapframe *tf; @@ -197,12 +194,7 @@ linux_sendsig(const ksiginfo_t *ksi, const sigset_t *mask) static void -linux_save_ucontext(l, tf, mask, sas, uc) - struct lwp *l; - struct trapframe *tf; - const sigset_t *mask; - struct sigaltstack *sas; - struct linux_ucontext *uc; +linux_save_ucontext(struct lwp *l, struct trapframe *tf, const sigset_t *mask, struct sigaltstack *sas, struct linux_ucontext *uc) { uc->uc_flags = 0; uc->uc_link = NULL; @@ -213,11 +205,7 @@ linux_save_ucontext(l, tf, mask, sas, uc) } static void -linux_save_sigcontext(l, tf, mask, sc) - struct lwp *l; - struct trapframe *tf; - const sigset_t *mask; - struct linux_sigcontext *sc; +linux_save_sigcontext(struct lwp *l, struct trapframe *tf, const sigset_t *mask, struct linux_sigcontext *sc) { /* Save register context. */ #ifdef VM86 @@ -449,10 +437,7 @@ linux_old_sendsig(const ksiginfo_t *ksi, const sigset_t *mask) * a machine fault. */ int -linux_sys_rt_sigreturn(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_rt_sigreturn(struct lwp *l, void *v, register_t *retval) { struct linux_sys_rt_sigreturn_args /* { syscallarg(struct linux_ucontext *) ucp; @@ -473,10 +458,7 @@ linux_sys_rt_sigreturn(l, v, retval) } int -linux_sys_sigreturn(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_sigreturn(struct lwp *l, void *v, register_t *retval) { struct linux_sys_sigreturn_args /* { syscallarg(struct linux_sigcontext *) scp; @@ -725,9 +707,7 @@ linux_sys_modify_ldt(struct lwp *l, void *v, * array for all major device numbers, and map linux_mknod too. */ dev_t -linux_fakedev(dev, raw) - dev_t dev; - int raw; +linux_fakedev(dev_t dev, int raw) { extern const struct cdevsw ptc_cdevsw, pts_cdevsw; const struct cdevsw *cd = cdevsw_lookup(dev); @@ -865,10 +845,7 @@ fd2biosinfo(struct proc *p, struct file *fp) * We come here in a last attempt to satisfy a Linux ioctl() call */ int -linux_machdepioctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_machdepioctl(struct lwp *l, void *v, register_t *retval) { struct linux_sys_ioctl_args /* { syscallarg(int) fd; @@ -1120,10 +1097,7 @@ linux_sys_iopl(struct lwp *l, void *v, register_t *retval) * just let it have the whole range. */ int -linux_sys_ioperm(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_ioperm(struct lwp *l, void *v, register_t *retval) { struct linux_sys_ioperm_args /* { syscallarg(unsigned int) lo; @@ -1161,8 +1135,7 @@ linux_get_uname_arch(void) #ifdef LINUX_NPTL void * -linux_get_newtls(l) - struct lwp *l; +linux_get_newtls(struct lwp *l) { struct trapframe *tf = l->l_md.md_regs; @@ -1171,9 +1144,7 @@ linux_get_newtls(l) } int -linux_set_newtls(l, tls) - struct lwp *l; - void *tls; +linux_set_newtls(struct lwp *l, void *tls) { /* XXX: Implement me */ return 0; diff --git a/sys/compat/linux/arch/i386/linux_ptrace.c b/sys/compat/linux/arch/i386/linux_ptrace.c index 471b61cc518..954699958cb 100644 --- a/sys/compat/linux/arch/i386/linux_ptrace.c +++ b/sys/compat/linux/arch/i386/linux_ptrace.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_ptrace.c,v 1.18 2007/07/09 21:10:46 ad Exp $ */ +/* $NetBSD: linux_ptrace.c,v 1.19 2007/12/08 18:36:06 dsl Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.18 2007/07/09 21:10:46 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.19 2007/12/08 18:36:06 dsl Exp $"); #include <sys/param.h> #include <sys/malloc.h> @@ -125,10 +125,7 @@ struct linux_user { #define ISSET(t, f) ((t) & (f)) int -linux_sys_ptrace_arch(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_ptrace_arch(struct lwp *l, void *v, register_t *retval) { struct linux_sys_ptrace_args /* { syscallarg(int) request; diff --git a/sys/compat/linux/arch/m68k/linux_machdep.c b/sys/compat/linux/arch/m68k/linux_machdep.c index 2caf4a206d2..4aa38f67946 100644 --- a/sys/compat/linux/arch/m68k/linux_machdep.c +++ b/sys/compat/linux/arch/m68k/linux_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_machdep.c,v 1.34 2007/12/04 18:40:14 dsl Exp $ */ +/* $NetBSD: linux_machdep.c,v 1.35 2007/12/08 18:36:06 dsl Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.34 2007/12/04 18:40:14 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.35 2007/12/08 18:36:06 dsl Exp $"); #define COMPAT_LINUX 1 @@ -95,10 +95,7 @@ void setup_linux_rt_sigframe(struct frame *frame, int sig, * Setup registers on program execution. */ void -linux_setregs(l, epp, stack) - struct lwp *l; - struct exec_package *epp; - u_long stack; +linux_setregs(struct lwp *l, struct exec_package *epp, u_long stack) { setregs(l, epp, stack); @@ -108,11 +105,7 @@ linux_setregs(l, epp, stack) * Setup signal frame for old signal interface. */ void -setup_linux_sigframe(frame, sig, mask, usp) - struct frame *frame; - int sig; - const sigset_t *mask; - void *usp; +setup_linux_sigframe(struct frame *frame, int sig, const sigset_t *mask, void *usp) { struct lwp *l = curlwp; struct proc *p = l->l_proc; @@ -275,12 +268,7 @@ setup_linux_sigframe(frame, sig, mask, usp) * Setup signal frame for new RT signal interface. */ void -setup_linux_rt_sigframe(frame, sig, mask, usp, l) - struct frame *frame; - int sig; - const sigset_t *mask; - void *usp; - struct lwp *l; +setup_linux_rt_sigframe(struct frame *frame, int sig, const sigset_t *mask, void *usp, struct lwp *l) { struct proc *p = l->l_proc; struct linux_rt_sigframe *fp, kf; @@ -512,10 +500,7 @@ linux_sendsig(const ksiginfo_t *ksi, const sigset_t *mask) */ /* ARGSUSED */ int -linux_sys_sigreturn(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_sigreturn(struct lwp *l, void *v, register_t *retval) { struct proc *p = l->l_proc; struct frame *frame; @@ -671,10 +656,7 @@ bad: /* ARGSUSED */ int -linux_sys_rt_sigreturn(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_rt_sigreturn(struct lwp *l, void *v, register_t *retval) { struct proc *p = l->l_proc; struct frame *frame; @@ -834,10 +816,7 @@ bad: /* ARGSUSED */ int -linux_sys_cacheflush(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_cacheflush(struct lwp *l, void *v, register_t *retval) { struct linux_sys_cacheflush_args /* { syscallarg(unsigned long) addr; @@ -897,9 +876,7 @@ linux_sys_cacheflush(l, v, retval) * Convert NetBSD's devices to Linux's. */ dev_t -linux_fakedev(dev, raw) - dev_t dev; - int raw; +linux_fakedev(dev_t dev, int raw) { /* do nothing for now */ @@ -910,10 +887,7 @@ linux_fakedev(dev, raw) * We come here in a last attempt to satisfy a Linux ioctl() call. */ int -linux_machdepioctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_machdepioctl(struct lwp *l, void *v, register_t *retval) { struct linux_sys_ioctl_args /* { syscallarg(int) fd; diff --git a/sys/compat/linux/arch/mips/linux_machdep.c b/sys/compat/linux/arch/mips/linux_machdep.c index edbd8ee57a0..53a0804006a 100644 --- a/sys/compat/linux/arch/mips/linux_machdep.c +++ b/sys/compat/linux/arch/mips/linux_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_machdep.c,v 1.33 2007/11/08 21:07:23 njoly Exp $ */ +/* $NetBSD: linux_machdep.c,v 1.34 2007/12/08 18:36:06 dsl Exp $ */ /*- * Copyright (c) 1995, 2000, 2001 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.33 2007/11/08 21:07:23 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.34 2007/12/08 18:36:06 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -102,10 +102,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.33 2007/11/08 21:07:23 njoly Exp * entry uses NetBSD's native setregs instead of linux_setregs */ void -linux_setregs(l, pack, stack) - struct lwp *l; - struct exec_package *pack; - u_long stack; +linux_setregs(struct lwp *l, struct exec_package *pack, u_long stack) { setregs(l, pack, stack); return; @@ -121,9 +118,7 @@ linux_setregs(l, pack, stack) */ void -linux_sendsig(ksi, mask) - const ksiginfo_t *ksi; - const sigset_t *mask; +linux_sendsig(const ksiginfo_t *ksi, const sigset_t *mask) { const int sig = ksi->ksi_signo; struct lwp *l = curlwp; @@ -240,10 +235,7 @@ linux_sendsig(ksi, mask) * stack state from context left by sendsig (above). */ int -linux_sys_sigreturn(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_sigreturn(struct lwp *l, void *v, register_t *retval) { struct linux_sys_sigreturn_args /* { syscallarg(struct linux_sigframe *) sf; @@ -294,10 +286,7 @@ linux_sys_sigreturn(l, v, retval) int -linux_sys_rt_sigreturn(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_rt_sigreturn(struct lwp *l, void *v, register_t *retval) { return (ENOSYS); } @@ -305,10 +294,7 @@ linux_sys_rt_sigreturn(l, v, retval) #if 0 int -linux_sys_modify_ldt(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_modify_ldt(struct lwp *l, void *v, register_t *retval) { /* * This syscall is not implemented in Linux/Mips: we should not @@ -325,9 +311,7 @@ linux_sys_modify_ldt(l, v, retval) * major device numbers remapping */ dev_t -linux_fakedev(dev, raw) - dev_t dev; - int raw; +linux_fakedev(dev_t dev, int raw) { /* XXX write me */ return dev; @@ -337,10 +321,7 @@ linux_fakedev(dev, raw) * We come here in a last attempt to satisfy a Linux ioctl() call */ int -linux_machdepioctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_machdepioctl(struct lwp *l, void *v, register_t *retval) { return 0; } @@ -350,10 +331,7 @@ linux_machdepioctl(l, v, retval) * just let it have the whole range. */ int -linux_sys_ioperm(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_ioperm(struct lwp *l, void *v, register_t *retval) { /* * This syscall is not implemented in Linux/Mips: we should not be here @@ -368,10 +346,7 @@ linux_sys_ioperm(l, v, retval) * wrapper linux_sys_new_uname() -> linux_sys_uname() */ int -linux_sys_new_uname(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_new_uname(struct lwp *l, void *v, register_t *retval) { /* * Use this if you want to try Linux emulation with a glibc-2.2 @@ -402,10 +377,7 @@ linux_sys_new_uname(l, v, retval) * we emulate this broken beahior. */ int -linux_sys_cacheflush(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_cacheflush(struct lwp *l, void *v, register_t *retval) { mips_icache_sync_all(); mips_dcache_wbinv_all(); @@ -417,10 +389,7 @@ linux_sys_cacheflush(l, v, retval) * some binaries and some libraries use it. */ int -linux_sys_sysmips(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_sysmips(struct lwp *l, void *v, register_t *retval) { struct linux_sys_sysmips_args { syscallarg(int) cmd; diff --git a/sys/compat/linux/arch/powerpc/linux_machdep.c b/sys/compat/linux/arch/powerpc/linux_machdep.c index 4930197bd57..db8fe5119f1 100644 --- a/sys/compat/linux/arch/powerpc/linux_machdep.c +++ b/sys/compat/linux/arch/powerpc/linux_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_machdep.c,v 1.35 2007/10/19 12:16:38 ad Exp $ */ +/* $NetBSD: linux_machdep.c,v 1.36 2007/12/08 18:36:06 dsl Exp $ */ /*- * Copyright (c) 1995, 2000, 2001 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.35 2007/10/19 12:16:38 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.36 2007/12/08 18:36:06 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -97,10 +97,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.35 2007/10/19 12:16:38 ad Exp $" * entry uses NetBSD's native setregs instead of linux_setregs */ void -linux_setregs(l, pack, stack) - struct lwp *l; - struct exec_package *pack; - u_long stack; +linux_setregs(struct lwp *l, struct exec_package *pack, u_long stack) { setregs(l, pack, stack); } @@ -277,10 +274,7 @@ linux_sendsig(const ksiginfo_t *ksi, const sigset_t *mask) * XXX not tested */ int -linux_sys_rt_sigreturn(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_rt_sigreturn(struct lwp *l, void *v, register_t *retval) { struct linux_sys_rt_sigreturn_args /* { syscallarg(struct linux_rt_sigframe *) sfp; @@ -370,10 +364,7 @@ linux_sys_rt_sigreturn(l, v, retval) * The following needs code review for potential security issues */ int -linux_sys_sigreturn(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_sigreturn(struct lwp *l, void *v, register_t *retval) { struct linux_sys_sigreturn_args /* { syscallarg(struct linux_sigcontext *) scp; @@ -460,10 +451,7 @@ linux_sys_sigreturn(l, v, retval) #if 0 int -linux_sys_modify_ldt(p, v, retval) - struct proc *p; - void *v; - register_t *retval; +linux_sys_modify_ldt(struct proc *p, void *v, register_t *retval) { /* * This syscall is not implemented in Linux/PowerPC: we should not @@ -480,9 +468,7 @@ linux_sys_modify_ldt(p, v, retval) * major device numbers remapping */ dev_t -linux_fakedev(dev, raw) - dev_t dev; - int raw; +linux_fakedev(dev_t dev, int raw) { /* XXX write me */ return dev; @@ -492,10 +478,7 @@ linux_fakedev(dev, raw) * We come here in a last attempt to satisfy a Linux ioctl() call */ int -linux_machdepioctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_machdepioctl(struct lwp *l, void *v, register_t *retval) { struct linux_sys_ioctl_args /* { syscallarg(int) fd; @@ -525,10 +508,7 @@ linux_machdepioctl(l, v, retval) * to rely on I/O permission maps, which are not implemented. */ int -linux_sys_iopl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_iopl(struct lwp *l, void *v, register_t *retval) { /* * This syscall is not implemented in Linux/PowerPC: we should not be here @@ -545,10 +525,7 @@ linux_sys_iopl(l, v, retval) * just let it have the whole range. */ int -linux_sys_ioperm(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_ioperm(struct lwp *l, void *v, register_t *retval) { /* * This syscall is not implemented in Linux/PowerPC: we should not be here @@ -563,10 +540,7 @@ linux_sys_ioperm(l, v, retval) * wrapper linux_sys_new_uname() -> linux_sys_uname() */ int -linux_sys_new_uname(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_new_uname(struct lwp *l, void *v, register_t *retval) { return linux_sys_uname(l, v, retval); } @@ -575,10 +549,7 @@ linux_sys_new_uname(l, v, retval) * wrapper linux_sys_new_select() -> linux_sys_select() */ int -linux_sys_new_select(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux_sys_new_select(struct lwp *l, void *v, register_t *retval) { return linux_sys_select(l, v, retval); } 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; diff --git a/sys/compat/linux32/arch/amd64/linux32_machdep.c b/sys/compat/linux32/arch/amd64/linux32_machdep.c index 3e0378e1ded..38b896416ad 100644 --- a/sys/compat/linux32/arch/amd64/linux32_machdep.c +++ b/sys/compat/linux32/arch/amd64/linux32_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_machdep.c,v 1.14 2007/12/04 18:40:18 dsl Exp $ */ +/* $NetBSD: linux32_machdep.c,v 1.15 2007/12/08 18:36:10 dsl Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux32_machdep.c,v 1.14 2007/12/04 18:40:18 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_machdep.c,v 1.15 2007/12/08 18:36:10 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -344,12 +344,7 @@ linux32_setregs(struct lwp *l, struct exec_package *pack, u_long stack) } static void -linux32_save_ucontext(l, tf, mask, sas, uc) - struct lwp *l; - struct trapframe *tf; - const sigset_t *mask; - struct sigaltstack *sas; - struct linux32_ucontext *uc; +linux32_save_ucontext(struct lwp *l, struct trapframe *tf, const sigset_t *mask, struct sigaltstack *sas, struct linux32_ucontext *uc) { uc->uc_flags = 0; NETBSD32PTR32(uc->uc_link, NULL); @@ -397,10 +392,7 @@ linux32_save_sigcontext(l, tf, mask, sc) } int -linux32_sys_sigreturn(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_sigreturn(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_sigreturn_args /* { syscallarg(linux32_sigcontextp_t) scp; @@ -415,10 +407,7 @@ linux32_sys_sigreturn(l, v, retval) } int -linux32_sys_rt_sigreturn(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_rt_sigreturn(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_rt_sigreturn_args /* { syscallarg(linux32_ucontextp_t) ucp; diff --git a/sys/compat/linux32/common/linux32_dirent.c b/sys/compat/linux32/common/linux32_dirent.c index c37617eba92..52542d68a3d 100644 --- a/sys/compat/linux32/common/linux32_dirent.c +++ b/sys/compat/linux32/common/linux32_dirent.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_dirent.c,v 1.2 2007/02/09 21:55:21 ad Exp $ */ +/* $NetBSD: linux32_dirent.c,v 1.3 2007/12/08 18:36:10 dsl Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -33,7 +33,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux32_dirent.c,v 1.2 2007/02/09 21:55:21 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_dirent.c,v 1.3 2007/12/08 18:36:10 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -70,10 +70,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux32_dirent.c,v 1.2 2007/02/09 21:55:21 ad Exp $" #include <compat/linux32/linux32_syscallargs.h> int -linux32_sys_getdents(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_getdents(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_getdents_args /* { syscallcarg(int) fd; @@ -91,10 +88,7 @@ linux32_sys_getdents(l, v, retval) int -linux32_sys_getdents64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_getdents64(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_getdents64_args /* { syscallcarg(int) fd; diff --git a/sys/compat/linux32/common/linux32_exec.c b/sys/compat/linux32/common/linux32_exec.c index 6fc6a342b78..3e7906d7f8d 100644 --- a/sys/compat/linux32/common/linux32_exec.c +++ b/sys/compat/linux32/common/linux32_exec.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_exec.c,v 1.8 2007/12/04 18:40:18 dsl Exp $ */ +/* $NetBSD: linux32_exec.c,v 1.9 2007/12/08 18:36:11 dsl Exp $ */ /*- * Copyright (c) 1994-2007 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux32_exec.c,v 1.8 2007/12/04 18:40:18 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_exec.c,v 1.9 2007/12/08 18:36:11 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -214,9 +214,7 @@ linux32_e_proc_init(p, parent, forkflags) * the executed process is of same emulation as original forked one. */ static void -linux32_e_proc_exec(p, epp) - struct proc *p; - struct exec_package *epp; +linux32_e_proc_exec(struct proc *p, struct exec_package *epp) { /* exec, use our vmspace */ linux32_e_proc_init(p, NULL, 0); @@ -226,8 +224,7 @@ linux32_e_proc_exec(p, epp) * Emulation per-process exit hook. */ static void -linux32_e_proc_exit(p) - struct proc *p; +linux32_e_proc_exit(struct proc *p) { struct linux_emuldata *e = p->p_emuldata; diff --git a/sys/compat/linux32/common/linux32_fcntl.c b/sys/compat/linux32/common/linux32_fcntl.c index 7f17c36c2f4..14aa44ed55a 100644 --- a/sys/compat/linux32/common/linux32_fcntl.c +++ b/sys/compat/linux32/common/linux32_fcntl.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_fcntl.c,v 1.2 2007/02/09 21:55:21 ad Exp $ */ +/* $NetBSD: linux32_fcntl.c,v 1.3 2007/12/08 18:36:11 dsl Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -33,7 +33,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux32_fcntl.c,v 1.2 2007/02/09 21:55:21 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_fcntl.c,v 1.3 2007/12/08 18:36:11 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -70,10 +70,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux32_fcntl.c,v 1.2 2007/02/09 21:55:21 ad Exp $") #include <compat/linux32/linux32_syscallargs.h> int -linux32_sys_open(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_open(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_open_args /* { syscallarg(const netbsd32_charp) path; @@ -90,10 +87,7 @@ linux32_sys_open(l, v, retval) } int -linux32_sys_fcntl64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_fcntl64(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_fcntl64_args /* { syscallcarg(int) fd; @@ -110,10 +104,7 @@ linux32_sys_fcntl64(l, v, retval) } int -linux32_sys_fcntl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_fcntl(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_fcntl_args /* { syscallcarg(int) fd; diff --git a/sys/compat/linux32/common/linux32_ioctl.c b/sys/compat/linux32/common/linux32_ioctl.c index 384bba8e6b6..bd1b88382a1 100644 --- a/sys/compat/linux32/common/linux32_ioctl.c +++ b/sys/compat/linux32/common/linux32_ioctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_ioctl.c,v 1.7 2007/03/18 21:38:32 dsl Exp $ */ +/* $NetBSD: linux32_ioctl.c,v 1.8 2007/12/08 18:36:11 dsl Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux32_ioctl.c,v 1.7 2007/03/18 21:38:32 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_ioctl.c,v 1.8 2007/12/08 18:36:11 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -57,10 +57,7 @@ extern int linux_ioctl_socket(struct lwp *, struct linux_sys_ioctl_args *, register_t *); int -linux32_sys_ioctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_ioctl(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_ioctl_args /* { syscallarg(int) fd; diff --git a/sys/compat/linux32/common/linux32_misc.c b/sys/compat/linux32/common/linux32_misc.c index c5e355ef8bb..d416a859242 100644 --- a/sys/compat/linux32/common/linux32_misc.c +++ b/sys/compat/linux32/common/linux32_misc.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_misc.c,v 1.7 2007/04/30 14:05:47 dsl Exp $ */ +/* $NetBSD: linux32_misc.c,v 1.8 2007/12/08 18:36:11 dsl Exp $ */ /*- * Copyright (c) 1995, 1998, 1999 The NetBSD Foundation, Inc. @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux32_misc.c,v 1.7 2007/04/30 14:05:47 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_misc.c,v 1.8 2007/12/08 18:36:11 dsl Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -70,10 +70,7 @@ extern const int linux_fstypes_cnt; * Implement the fs stat functions. Straightforward. */ int -linux32_sys_statfs(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_statfs(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_statfs_args /* { syscallarg(const netbsd32_charp char) path; diff --git a/sys/compat/linux32/common/linux32_mman.c b/sys/compat/linux32/common/linux32_mman.c index 686a2698063..e49a29ad196 100644 --- a/sys/compat/linux32/common/linux32_mman.c +++ b/sys/compat/linux32/common/linux32_mman.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_mman.c,v 1.4 2007/10/31 09:16:55 njoly Exp $ */ +/* $NetBSD: linux32_mman.c,v 1.5 2007/12/08 18:36:11 dsl Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -33,7 +33,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux32_mman.c,v 1.4 2007/10/31 09:16:55 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_mman.c,v 1.5 2007/12/08 18:36:11 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -70,10 +70,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux32_mman.c,v 1.4 2007/10/31 09:16:55 njoly Exp $ #include <compat/linux32/linux32_syscallargs.h> int -linux32_sys_old_mmap(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_old_mmap(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_old_mmap_args /* { syscallarg(linux32_oldmmapp) lmp; @@ -104,10 +101,7 @@ linux32_sys_mprotect(l, v, retval) } int -linux32_sys_mremap(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_mremap(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_mremap_args /* { syscallarg(netbsd32_voidp) old_address; @@ -126,10 +120,7 @@ linux32_sys_mremap(l, v, retval) } int -linux32_sys_mmap2(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_mmap2(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_mmap2_args /* { syscallarg(netbsd32_u_long) addr; diff --git a/sys/compat/linux32/common/linux32_resource.c b/sys/compat/linux32/common/linux32_resource.c index dfd1ab310f3..689bcce9c64 100644 --- a/sys/compat/linux32/common/linux32_resource.c +++ b/sys/compat/linux32/common/linux32_resource.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_resource.c,v 1.6 2007/05/12 21:07:02 dsl Exp $ */ +/* $NetBSD: linux32_resource.c,v 1.7 2007/12/08 18:36:11 dsl Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -33,7 +33,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux32_resource.c,v 1.6 2007/05/12 21:07:02 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_resource.c,v 1.7 2007/12/08 18:36:11 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -72,10 +72,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux32_resource.c,v 1.6 2007/05/12 21:07:02 dsl Exp #include <compat/linux32/linux32_syscallargs.h> int -linux32_sys_getrlimit(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_getrlimit(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_getrlimit_args /* { syscallarg(int) which; @@ -94,10 +91,7 @@ linux32_sys_getrlimit(l, v, retval) } int -linux32_sys_setrlimit(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_setrlimit(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_setrlimit_args /* { syscallarg(int) which; @@ -121,10 +115,7 @@ linux32_sys_setrlimit(l, v, retval) } int -linux32_sys_ugetrlimit(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_ugetrlimit(struct lwp *l, void *v, register_t *retval) { return linux32_sys_getrlimit(l, v, retval); } diff --git a/sys/compat/linux32/common/linux32_sched.c b/sys/compat/linux32/common/linux32_sched.c index fd5f91b1717..46a5b9ab1d0 100644 --- a/sys/compat/linux32/common/linux32_sched.c +++ b/sys/compat/linux32/common/linux32_sched.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_sched.c,v 1.4 2007/11/07 00:24:31 njoly Exp $ */ +/* $NetBSD: linux32_sched.c,v 1.5 2007/12/08 18:36:11 dsl Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -33,7 +33,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux32_sched.c,v 1.4 2007/11/07 00:24:31 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_sched.c,v 1.5 2007/12/08 18:36:11 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -70,10 +70,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux32_sched.c,v 1.4 2007/11/07 00:24:31 njoly Exp #include <compat/linux32/linux32_syscallargs.h> int -linux32_sys_clone(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_clone(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_clone_args /* { syscallarg(int) flags; @@ -92,10 +89,7 @@ linux32_sys_clone(l, v, retval) } int -linux32_sys_sched_getscheduler(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_sched_getscheduler(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_sched_getscheduler_args /* { syscallarg(pid_t) pid; @@ -108,10 +102,7 @@ linux32_sys_sched_getscheduler(l, v, retval) } int -linux32_sys_sched_setscheduler(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_sched_setscheduler(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_sched_setscheduler_args /* { syscallarg(int) pid; @@ -128,10 +119,7 @@ linux32_sys_sched_setscheduler(l, v, retval) } int -linux32_sys_sched_getparam(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_sched_getparam(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_sched_getparam_args /* { syscallarg(pid_t) pid; @@ -146,10 +134,7 @@ linux32_sys_sched_getparam(l, v, retval) } int -linux32_sys_exit_group(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_exit_group(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_exit_group_args /* { syscallarg(int) error_code; diff --git a/sys/compat/linux32/common/linux32_signal.c b/sys/compat/linux32/common/linux32_signal.c index 3769748ba35..3dbbb2f9440 100644 --- a/sys/compat/linux32/common/linux32_signal.c +++ b/sys/compat/linux32/common/linux32_signal.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_signal.c,v 1.4 2007/03/18 21:38:32 dsl Exp $ */ +/* $NetBSD: linux32_signal.c,v 1.5 2007/12/08 18:36:12 dsl Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -53,9 +53,7 @@ extern const int native_to_linux32_signo[]; extern const int linux32_to_native_signo[]; void -linux32_to_native_sigset(bss, lss) - sigset_t *bss; - const linux32_sigset_t *lss; +linux32_to_native_sigset(sigset_t *bss, const linux32_sigset_t *lss) { int i, newsig; @@ -70,9 +68,7 @@ linux32_to_native_sigset(bss, lss) } void -native_to_linux32_sigset(lss, bss) - linux32_sigset_t *lss; - const sigset_t *bss; +native_to_linux32_sigset(linux32_sigset_t *lss, const sigset_t *bss) { int i, newsig; @@ -87,8 +83,7 @@ native_to_linux32_sigset(lss, bss) } unsigned int -native_to_linux32_sigflags(bsf) - const int bsf; +native_to_linux32_sigflags(const int bsf) { unsigned int lsf = 0; if ((bsf & SA_NOCLDSTOP) != 0) @@ -109,8 +104,7 @@ native_to_linux32_sigflags(bsf) } int -linux32_to_native_sigflags(lsf) - const unsigned long lsf; +linux32_to_native_sigflags(const unsigned long lsf) { int bsf = 0; if ((lsf & LINUX32_SA_NOCLDSTOP) != 0) @@ -137,9 +131,7 @@ linux32_to_native_sigflags(lsf) } void -linux32_to_native_sigaction(bsa, lsa) - struct sigaction *bsa; - const struct linux32_sigaction *lsa; +linux32_to_native_sigaction(struct sigaction *bsa, const struct linux32_sigaction *lsa) { bsa->sa_handler = NETBSD32PTR64(lsa->linux_sa_handler); linux32_to_native_sigset(&bsa->sa_mask, &lsa->linux_sa_mask); @@ -147,9 +139,7 @@ linux32_to_native_sigaction(bsa, lsa) } void -native_to_linux32_sigaction(lsa, bsa) - struct linux32_sigaction *lsa; - const struct sigaction *bsa; +native_to_linux32_sigaction(struct linux32_sigaction *lsa, const struct sigaction *bsa) { NETBSD32PTR32(lsa->linux_sa_handler, bsa->sa_handler); native_to_linux32_sigset(&lsa->linux_sa_mask, &bsa->sa_mask); @@ -158,9 +148,7 @@ native_to_linux32_sigaction(lsa, bsa) } void -native_to_linux32_sigaltstack(lss, bss) - struct linux32_sigaltstack *lss; - const struct sigaltstack *bss; +native_to_linux32_sigaltstack(struct linux32_sigaltstack *lss, const struct sigaltstack *bss) { NETBSD32PTR32(lss->ss_sp, bss->ss_sp); lss->ss_size = bss->ss_size; @@ -174,9 +162,7 @@ native_to_linux32_sigaltstack(lss, bss) void -native_to_linux32_old_sigset(lss, bss) - linux32_old_sigset_t *lss; - const sigset_t *bss; +native_to_linux32_old_sigset(linux32_old_sigset_t *lss, const sigset_t *bss) { linux32_sigset_t lsnew; @@ -187,9 +173,7 @@ native_to_linux32_old_sigset(lss, bss) } void -linux32_old_to_native_sigset(bss, lss) - sigset_t *bss; - const linux32_old_sigset_t *lss; +linux32_old_to_native_sigset(sigset_t *bss, const linux32_old_sigset_t *lss) { linux32_sigset_t ls; @@ -200,10 +184,7 @@ linux32_old_to_native_sigset(bss, lss) } int -linux32_sys_rt_sigaction(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_rt_sigaction(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_rt_sigaction_args /* { syscallarg(int) signum; @@ -259,10 +240,7 @@ linux32_sys_rt_sigaction(l, v, retval) } int -linux32_sys_rt_sigprocmask(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_rt_sigprocmask(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_rt_sigprocmask_args /* { syscallarg(int) how; @@ -369,10 +347,7 @@ linux32_sys_rt_sigsuspend(l, v, retval) } int -linux32_sys_signal(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_signal(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_signal_args /* { syscallarg(int) signum; diff --git a/sys/compat/linux32/common/linux32_socket.c b/sys/compat/linux32/common/linux32_socket.c index fafd18761d3..54bec8fc725 100644 --- a/sys/compat/linux32/common/linux32_socket.c +++ b/sys/compat/linux32/common/linux32_socket.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_socket.c,v 1.3 2007/02/09 21:55:21 ad Exp $ */ +/* $NetBSD: linux32_socket.c,v 1.4 2007/12/08 18:36:12 dsl Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -33,7 +33,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux32_socket.c,v 1.3 2007/02/09 21:55:21 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_socket.c,v 1.4 2007/12/08 18:36:12 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -70,10 +70,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux32_socket.c,v 1.3 2007/02/09 21:55:21 ad Exp $" #include <compat/linux32/linux32_syscallargs.h> int -linux32_sys_socketpair(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_socketpair(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_socketpair_args /* { syscallarg(int) domain; @@ -92,10 +89,7 @@ linux32_sys_socketpair(l, v, retval) } int -linux32_sys_sendto(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_sendto(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_sendto_args /* { syscallarg(int) s; @@ -119,10 +113,7 @@ linux32_sys_sendto(l, v, retval) int -linux32_sys_recvfrom(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_recvfrom(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_recvfrom_args /* { syscallarg(int) s; @@ -145,10 +136,7 @@ linux32_sys_recvfrom(l, v, retval) } int -linux32_sys_setsockopt(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_setsockopt(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_setsockopt_args /* { syscallarg(int) s; @@ -170,10 +158,7 @@ linux32_sys_setsockopt(l, v, retval) int -linux32_sys_getsockopt(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_getsockopt(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_getsockopt_args /* { syscallarg(int) s; @@ -194,10 +179,7 @@ linux32_sys_getsockopt(l, v, retval) } int -linux32_sys_socket(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_socket(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_socket_args /* { syscallarg(int) domain; @@ -214,10 +196,7 @@ linux32_sys_socket(l, v, retval) } int -linux32_sys_bind(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_bind(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_bind_args /* { syscallarg(int) s; @@ -234,10 +213,7 @@ linux32_sys_bind(l, v, retval) } int -linux32_sys_connect(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_connect(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_connect_args /* { syscallarg(int) s; @@ -259,10 +235,7 @@ linux32_sys_connect(l, v, retval) } int -linux32_sys_accept(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_accept(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_accept_args /* { syscallarg(int) s; @@ -279,10 +252,7 @@ linux32_sys_accept(l, v, retval) } int -linux32_sys_getpeername(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_getpeername(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_getpeername_args /* { syscallarg(int) fdes; @@ -299,10 +269,7 @@ linux32_sys_getpeername(l, v, retval) } int -linux32_sys_getsockname(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_getsockname(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_getsockname_args /* { syscallarg(int) fdec; @@ -319,10 +286,7 @@ linux32_sys_getsockname(l, v, retval) } int -linux32_sys_sendmsg(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_sendmsg(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_sendmsg_args /* { syscallarg(int) s; @@ -339,10 +303,7 @@ linux32_sys_sendmsg(l, v, retval) } int -linux32_sys_recvmsg(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_recvmsg(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_recvmsg_args /* { syscallarg(int) s; @@ -359,10 +320,7 @@ linux32_sys_recvmsg(l, v, retval) } int -linux32_sys_send(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_send(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_send_args /* { syscallarg(int) s; @@ -383,10 +341,7 @@ linux32_sys_send(l, v, retval) } int -linux32_sys_recv(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_recv(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_recv_args /* { syscallarg(int) s; diff --git a/sys/compat/linux32/common/linux32_socketcall.c b/sys/compat/linux32/common/linux32_socketcall.c index 44edbf1fe7b..0f76048fd0f 100644 --- a/sys/compat/linux32/common/linux32_socketcall.c +++ b/sys/compat/linux32/common/linux32_socketcall.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_socketcall.c,v 1.4 2007/08/15 12:07:30 ad Exp $ */ +/* $NetBSD: linux32_socketcall.c,v 1.5 2007/12/08 18:36:12 dsl Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux32_socketcall.c,v 1.4 2007/08/15 12:07:30 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_socketcall.c,v 1.5 2007/12/08 18:36:12 dsl Exp $"); #include "opt_ktrace.h" #include <sys/types.h> @@ -85,10 +85,7 @@ static const struct { #undef s int -linux32_sys_socketcall(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_socketcall(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_socketcall_args /* { syscallarg(int) what; diff --git a/sys/compat/linux32/common/linux32_stat.c b/sys/compat/linux32/common/linux32_stat.c index db7307f31d6..6912c23e9ae 100644 --- a/sys/compat/linux32/common/linux32_stat.c +++ b/sys/compat/linux32/common/linux32_stat.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_stat.c,v 1.8 2007/04/22 08:29:57 dsl Exp $ */ +/* $NetBSD: linux32_stat.c,v 1.9 2007/12/08 18:36:12 dsl Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -33,7 +33,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux32_stat.c,v 1.8 2007/04/22 08:29:57 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_stat.c,v 1.9 2007/12/08 18:36:12 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -76,9 +76,7 @@ static inline void linux32_from_stat(struct stat *, struct linux32_stat64 *); #define linux_fakedev(x,y) (x) static inline void -linux32_from_stat(st, st32) - struct stat *st; - struct linux32_stat64 *st32; +linux32_from_stat(struct stat *st, struct linux32_stat64 *st32) { bzero(st32, sizeof(*st32)); st32->lst_dev = linux_fakedev(st->st_dev, 0); diff --git a/sys/compat/linux32/common/linux32_sysctl.c b/sys/compat/linux32/common/linux32_sysctl.c index adf789ebc9c..d1aba2582b5 100644 --- a/sys/compat/linux32/common/linux32_sysctl.c +++ b/sys/compat/linux32/common/linux32_sysctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_sysctl.c,v 1.6 2007/08/15 12:07:30 ad Exp $ */ +/* $NetBSD: linux32_sysctl.c,v 1.7 2007/12/08 18:36:12 dsl Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux32_sysctl.c,v 1.6 2007/08/15 12:07:30 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_sysctl.c,v 1.7 2007/12/08 18:36:12 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -146,10 +146,7 @@ SYSCTL_SETUP(linux32_sysctl_setup, "linux32 emulated sysctl subtree setup") } int -linux32_sys___sysctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys___sysctl(struct lwp *l, void *v, register_t *retval) { struct linux32_sys___sysctl_args /* { syscallarg(linux32___sysctlp_t) lsp; diff --git a/sys/compat/linux32/common/linux32_sysinfo.c b/sys/compat/linux32/common/linux32_sysinfo.c index 82d27357f48..6221fe9e366 100644 --- a/sys/compat/linux32/common/linux32_sysinfo.c +++ b/sys/compat/linux32/common/linux32_sysinfo.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_sysinfo.c,v 1.4 2007/07/21 23:39:46 xtraeme Exp $ */ +/* $NetBSD: linux32_sysinfo.c,v 1.5 2007/12/08 18:36:12 dsl Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -33,7 +33,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux32_sysinfo.c,v 1.4 2007/07/21 23:39:46 xtraeme Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_sysinfo.c,v 1.5 2007/12/08 18:36:12 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -60,10 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux32_sysinfo.c,v 1.4 2007/07/21 23:39:46 xtraeme /* ARGSUSED */ int -linux32_sys_sysinfo(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_sysinfo(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_sysinfo_args /* { syscallarg(struct linux32_sysinfo *) arg; diff --git a/sys/compat/linux32/common/linux32_time.c b/sys/compat/linux32/common/linux32_time.c index 05860c5c829..bd0ef9115f2 100644 --- a/sys/compat/linux32/common/linux32_time.c +++ b/sys/compat/linux32/common/linux32_time.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_time.c,v 1.14 2007/11/25 00:35:27 elad Exp $ */ +/* $NetBSD: linux32_time.c,v 1.15 2007/12/08 18:36:12 dsl Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -33,7 +33,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux32_time.c,v 1.14 2007/11/25 00:35:27 elad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_time.c,v 1.15 2007/12/08 18:36:12 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -75,10 +75,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux32_time.c,v 1.14 2007/11/25 00:35:27 elad Exp $ extern struct timezone linux_sys_tz; int -linux32_sys_gettimeofday(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_gettimeofday(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_gettimeofday_args /* { syscallarg(netbsd32_timevalp_t) tp; @@ -107,10 +104,7 @@ linux32_sys_gettimeofday(l, v, retval) } int -linux32_sys_settimeofday(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_settimeofday(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_settimeofday_args /* { syscallarg(netbsd32_timevalp_t) tp; @@ -125,10 +119,7 @@ linux32_sys_settimeofday(l, v, retval) } int -linux32_sys_time(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_time(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_time_args /* { syscallcarg(linux32_timep_t) t; @@ -158,10 +149,7 @@ timeval_to_clock_t(struct timeval *tv) } int -linux32_sys_times(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_times(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_times_args /* { syscallarg(linux32_tmsp_t) tms; @@ -191,10 +179,7 @@ linux32_sys_times(l, v, retval) } int -linux32_sys_stime(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_stime(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_stime_args /* { syscallarg(linux32_timep_t) t; @@ -213,10 +198,7 @@ linux32_sys_stime(l, v, retval) } int -linux32_sys_utime(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_utime(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_utime_args /* { syscallarg(const netbsd32_charp) path; diff --git a/sys/compat/linux32/common/linux32_unistd.c b/sys/compat/linux32/common/linux32_unistd.c index f9f4de9509c..805f800468f 100644 --- a/sys/compat/linux32/common/linux32_unistd.c +++ b/sys/compat/linux32/common/linux32_unistd.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_unistd.c,v 1.14 2007/11/16 12:56:50 njoly Exp $ */ +/* $NetBSD: linux32_unistd.c,v 1.15 2007/12/08 18:36:12 dsl Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -33,7 +33,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux32_unistd.c,v 1.14 2007/11/16 12:56:50 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_unistd.c,v 1.15 2007/12/08 18:36:12 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -73,10 +73,7 @@ static int linux32_select1(struct lwp *, register_t *, int, fd_set *, fd_set *, fd_set *, struct timeval *); int -linux32_sys_brk(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_brk(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_brk_args /* { syscallarg(netbsd32_charp) nsize; @@ -88,10 +85,7 @@ linux32_sys_brk(l, v, retval) } int -linux32_sys_llseek(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_llseek(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_llseek_args /* { syscallcarg(int) fd; @@ -112,10 +106,7 @@ linux32_sys_llseek(l, v, retval) } int -linux32_sys_select(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_select(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_select_args /* { syscallarg(int) nfds; @@ -133,10 +124,7 @@ linux32_sys_select(l, v, retval) } int -linux32_sys_oldselect(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_oldselect(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_oldselect_args /* { syscallarg(linux32_oldselectp_t) lsp; @@ -234,10 +222,7 @@ linux32_select1(l, retval, nfds, readfds, writefds, exceptfds, timeout) } int -linux32_sys_pipe(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_pipe(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_pipe_args /* { syscallarg(netbsd32_intp) fd; @@ -262,10 +247,7 @@ linux32_sys_pipe(l, v, retval) int -linux32_sys_unlink(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_unlink(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_unlink_args /* { syscallarg(const netbsd32_charp) path; @@ -278,10 +260,7 @@ linux32_sys_unlink(l, v, retval) } int -linux32_sys_creat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_creat(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_creat_args /* { syscallarg(const netbsd32_charp) path; @@ -297,10 +276,7 @@ linux32_sys_creat(l, v, retval) } int -linux32_sys_mknod(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_mknod(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_mknod_args /* { syscallarg(const netbsd32_charp) path; @@ -317,10 +293,7 @@ linux32_sys_mknod(l, v, retval) } int -linux32_sys_chown16(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_chown16(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_chown16_args /* { syscallarg(const netbsd32_charp) path; @@ -345,10 +318,7 @@ linux32_sys_chown16(l, v, retval) } int -linux32_sys_lchown16(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_lchown16(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_lchown16_args /* { syscallarg(const netbsd32_charp) path; @@ -373,10 +343,7 @@ linux32_sys_lchown16(l, v, retval) } int -linux32_sys_break(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_break(struct lwp *l, void *v, register_t *retval) { #if 0 struct linux32_sys_break_args /* { @@ -388,10 +355,7 @@ linux32_sys_break(l, v, retval) } int -linux32_sys_rename(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_rename(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_rename_args /* { syscallarg(const netbsd32_charp) from; @@ -406,10 +370,7 @@ linux32_sys_rename(l, v, retval) } int -linux32_sys_getgroups16(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_getgroups16(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_getgroups16_args /* { syscallarg(int) gidsetsize; @@ -424,10 +385,7 @@ linux32_sys_getgroups16(l, v, retval) } int -linux32_sys_setgroups16(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_setgroups16(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_setgroups16_args /* { syscallarg(int) gidsetsize; @@ -442,10 +400,7 @@ linux32_sys_setgroups16(l, v, retval) } int -linux32_sys_swapon(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_swapon(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_swapon_args /* { syscallarg(const netbsd32_charp) name; @@ -459,10 +414,7 @@ linux32_sys_swapon(l, v, retval) } int -linux32_sys_swapoff(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_swapoff(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_swapoff_args /* { syscallarg(const netbsd32_charp) path; @@ -477,10 +429,7 @@ linux32_sys_swapoff(l, v, retval) int -linux32_sys_reboot(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_reboot(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_reboot_args /* { syscallarg(int) magic1; @@ -499,10 +448,7 @@ linux32_sys_reboot(l, v, retval) } int -linux32_sys_truncate(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_truncate(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_truncate_args /* { syscallarg(const netbsd32_charp) path; @@ -518,10 +464,7 @@ linux32_sys_truncate(l, v, retval) } int -linux32_sys_fchown16(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_fchown16(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_fchown16_args /* { syscallarg(int) fd; @@ -546,10 +489,7 @@ linux32_sys_fchown16(l, v, retval) } int -linux32_sys_setresuid(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_setresuid(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_setresuid_args /* { syscallarg(uid_t) ruid; @@ -566,10 +506,7 @@ linux32_sys_setresuid(l, v, retval) } int -linux32_sys_setresgid(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_setresgid(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_setresgid_args /* { syscallarg(gid_t) rgid; @@ -586,10 +523,7 @@ linux32_sys_setresgid(l, v, retval) } int -linux32_sys_nice(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_nice(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_nice_args /* { syscallarg(int) incr; @@ -604,10 +538,7 @@ linux32_sys_nice(l, v, retval) } int -linux32_sys_alarm(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_alarm(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_alarm_args /* { syscallarg(unsigned int) secs; @@ -620,10 +551,7 @@ linux32_sys_alarm(l, v, retval) } int -linux32_sys_fdatasync(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_fdatasync(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_fdatasync_args /* { syscallarg(int) fd; @@ -636,10 +564,7 @@ linux32_sys_fdatasync(l, v, retval) } int -linux32_sys_setfsuid(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_setfsuid(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_setfsuid_args /* { syscallarg(uid_t) uid; @@ -652,10 +577,7 @@ linux32_sys_setfsuid(l, v, retval) } int -linux32_sys_setreuid16(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_setreuid16(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_setreuid16_args /* { syscallarg(int) ruid; @@ -676,10 +598,7 @@ linux32_sys_setreuid16(l, v, retval) } int -linux32_sys_setregid16(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_setregid16(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_setregid16_args /* { syscallarg(int) rgid; @@ -700,10 +619,7 @@ linux32_sys_setregid16(l, v, retval) } int -linux32_sys_setresuid16(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_setresuid16(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_setresuid16_args /* { syscallarg(uid_t) ruid; @@ -729,10 +645,7 @@ linux32_sys_setresuid16(l, v, retval) } int -linux32_sys_setresgid16(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_setresgid16(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_setresgid16_args /* { syscallarg(gid_t) rgid; diff --git a/sys/compat/linux32/common/linux32_utsname.c b/sys/compat/linux32/common/linux32_utsname.c index 2a17a84a973..9aa2ce97469 100644 --- a/sys/compat/linux32/common/linux32_utsname.c +++ b/sys/compat/linux32/common/linux32_utsname.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_utsname.c,v 1.5 2007/11/09 17:43:17 njoly Exp $ */ +/* $NetBSD: linux32_utsname.c,v 1.6 2007/12/08 18:36:13 dsl Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -33,7 +33,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux32_utsname.c,v 1.5 2007/11/09 17:43:17 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_utsname.c,v 1.6 2007/12/08 18:36:13 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -70,10 +70,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux32_utsname.c,v 1.5 2007/11/09 17:43:17 njoly Ex #include <compat/linux32/linux32_syscallargs.h> int -linux32_sys_uname(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_uname(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_uname_args /* { syscallarg(linux32_utsnamep) up; @@ -94,10 +91,7 @@ linux32_sys_uname(l, v, retval) } int -linux32_sys_oldolduname(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_oldolduname(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_uname_args /* { syscallarg(linux32_oldoldutsnamep_t) up; diff --git a/sys/compat/linux32/common/linux32_wait.c b/sys/compat/linux32/common/linux32_wait.c index 764818f7880..399f376423d 100644 --- a/sys/compat/linux32/common/linux32_wait.c +++ b/sys/compat/linux32/common/linux32_wait.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_wait.c,v 1.3 2007/03/18 21:38:33 dsl Exp $ */ +/* $NetBSD: linux32_wait.c,v 1.4 2007/12/08 18:36:13 dsl Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -33,7 +33,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux32_wait.c,v 1.3 2007/03/18 21:38:33 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_wait.c,v 1.4 2007/12/08 18:36:13 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -70,10 +70,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux32_wait.c,v 1.3 2007/03/18 21:38:33 dsl Exp $") #include <compat/linux32/linux32_syscallargs.h> int -linux32_sys_waitpid(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_waitpid(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_waitpid_args /* { syscallarg(int) pid; @@ -91,10 +88,7 @@ linux32_sys_waitpid(l, v, retval) } int -linux32_sys_wait4(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +linux32_sys_wait4(struct lwp *l, void *v, register_t *retval) { struct linux32_sys_wait4_args /* { syscallarg(int) pid; diff --git a/sys/compat/m68k4k/m68k4k_exec.c b/sys/compat/m68k4k/m68k4k_exec.c index de09b1a021f..8abc1821f7a 100644 --- a/sys/compat/m68k4k/m68k4k_exec.c +++ b/sys/compat/m68k4k/m68k4k_exec.c @@ -1,4 +1,4 @@ -/* $NetBSD: m68k4k_exec.c,v 1.18 2007/12/04 18:40:19 dsl Exp $ */ +/* $NetBSD: m68k4k_exec.c,v 1.19 2007/12/08 18:36:13 dsl Exp $ */ /* * Copyright (c) 1993, 1994 Christopher G. Demetriou @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: m68k4k_exec.c,v 1.18 2007/12/04 18:40:19 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: m68k4k_exec.c,v 1.19 2007/12/08 18:36:13 dsl Exp $"); #if !defined(__m68k__) #error YOU GOTTA BE KIDDING! @@ -75,9 +75,7 @@ int exec_m68k4k_prep_omagic(struct lwp *, struct exec_package *); */ int -exec_m68k4k_makecmds(l, epp) - struct lwp *l; - struct exec_package *epp; +exec_m68k4k_makecmds(struct lwp *l, struct exec_package *epp) { u_long midmag, magic; u_short mid; @@ -128,9 +126,7 @@ exec_m68k4k_makecmds(l, epp) */ int -exec_m68k4k_prep_zmagic(l, epp) - struct lwp *l; - struct exec_package *epp; +exec_m68k4k_prep_zmagic(struct lwp *l, struct exec_package *epp) { struct exec *execp = epp->ep_hdr; int error; @@ -168,9 +164,7 @@ exec_m68k4k_prep_zmagic(l, epp) */ int -exec_m68k4k_prep_nmagic(l, epp) - struct lwp *l; - struct exec_package *epp; +exec_m68k4k_prep_nmagic(struct lwp *l, struct exec_package *epp) { struct exec *execp = epp->ep_hdr; long bsize, baddr; @@ -207,9 +201,7 @@ exec_m68k4k_prep_nmagic(l, epp) */ int -exec_m68k4k_prep_omagic(l, epp) - struct lwp *l; - struct exec_package *epp; +exec_m68k4k_prep_omagic(struct lwp *l, struct exec_package *epp) { struct exec *execp = epp->ep_hdr; long dsize, bsize, baddr; diff --git a/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_cpu.c b/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_cpu.c index 755419b1933..5b3a705d4fa 100644 --- a/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_cpu.c +++ b/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_cpu.c @@ -1,4 +1,4 @@ -/* $NetBSD: mach_fasttraps_cpu.c,v 1.5 2005/12/11 12:20:21 christos Exp $ */ +/* $NetBSD: mach_fasttraps_cpu.c,v 1.6 2007/12/08 18:36:16 dsl Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mach_fasttraps_cpu.c,v 1.5 2005/12/11 12:20:21 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mach_fasttraps_cpu.c,v 1.6 2007/12/08 18:36:16 dsl Exp $"); #include <sys/types.h> #include <sys/systm.h> @@ -63,10 +63,7 @@ __KERNEL_RCSID(0, "$NetBSD: mach_fasttraps_cpu.c,v 1.5 2005/12/11 12:20:21 chris /* We do not emulate anything here right now */ int -mach_sys_processor_facilities_used(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +mach_sys_processor_facilities_used(struct lwp *l, void *v, register_t *retval) { *retval = 0; return 0; @@ -74,10 +71,7 @@ mach_sys_processor_facilities_used(l, v, retval) /* This seems to be called only from within the kernel in Mach */ int -mach_sys_load_msr(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +mach_sys_load_msr(struct lwp *l, void *v, register_t *retval) { printf("mach_sys_load_msr()\n"); return 0; diff --git a/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_thread.c b/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_thread.c index ad7245f2309..001f5b146e1 100644 --- a/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_thread.c +++ b/sys/compat/mach/arch/powerpc/fasttraps/mach_fasttraps_thread.c @@ -1,4 +1,4 @@ -/* $NetBSD: mach_fasttraps_thread.c,v 1.8 2005/12/11 12:20:21 christos Exp $ */ +/* $NetBSD: mach_fasttraps_thread.c,v 1.9 2007/12/08 18:36:17 dsl Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mach_fasttraps_thread.c,v 1.8 2005/12/11 12:20:21 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mach_fasttraps_thread.c,v 1.9 2007/12/08 18:36:17 dsl Exp $"); #include <sys/types.h> #include <sys/systm.h> @@ -53,10 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: mach_fasttraps_thread.c,v 1.8 2005/12/11 12:20:21 ch #include <compat/mach/arch/powerpc/fasttraps/mach_fasttraps_syscallargs.h> int -mach_sys_cthread_set_self(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +mach_sys_cthread_set_self(struct lwp *l, void *v, register_t *retval) { struct mach_emuldata *med; struct mach_sys_cthread_set_self_args /* { @@ -72,10 +69,7 @@ mach_sys_cthread_set_self(l, v, retval) } int -mach_sys_cthread_self(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +mach_sys_cthread_self(struct lwp *l, void *v, register_t *retval) { struct mach_emuldata *med; diff --git a/sys/compat/mach/mach_bootstrap.c b/sys/compat/mach/mach_bootstrap.c index 657feea0595..3c1aaf28fd9 100644 --- a/sys/compat/mach/mach_bootstrap.c +++ b/sys/compat/mach/mach_bootstrap.c @@ -1,4 +1,4 @@ -/* $NetBSD: mach_bootstrap.c,v 1.12 2005/12/11 12:20:20 christos Exp $ */ +/* $NetBSD: mach_bootstrap.c,v 1.13 2007/12/08 18:36:13 dsl Exp $ */ /*- * Copyright (c) 2002-2003 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mach_bootstrap.c,v 1.12 2005/12/11 12:20:20 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mach_bootstrap.c,v 1.13 2007/12/08 18:36:13 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -53,8 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: mach_bootstrap.c,v 1.12 2005/12/11 12:20:20 christos #include <compat/mach/mach_services.h> int -mach_bootstrap_look_up(args) - struct mach_trap_args *args; +mach_bootstrap_look_up(struct mach_trap_args *args) { mach_bootstrap_look_up_request_t *req = args->smsg; mach_bootstrap_look_up_reply_t *rep = args->rmsg; diff --git a/sys/compat/mach/mach_clock.c b/sys/compat/mach/mach_clock.c index dfbdd15ffb5..7329aac9cc1 100644 --- a/sys/compat/mach/mach_clock.c +++ b/sys/compat/mach/mach_clock.c @@ -1,4 +1,4 @@ -/* $NetBSD: mach_clock.c,v 1.16 2006/11/16 01:32:44 christos Exp $ */ +/* $NetBSD: mach_clock.c,v 1.17 2007/12/08 18:36:13 dsl Exp $ */ /*- * Copyright (c) 2002-2003 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mach_clock.c,v 1.16 2006/11/16 01:32:44 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mach_clock.c,v 1.17 2007/12/08 18:36:13 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -123,8 +123,7 @@ mach_sys_timebase_info(struct lwp *l, void *v, int -mach_clock_get_time(args) - struct mach_trap_args *args; +mach_clock_get_time(struct mach_trap_args *args) { mach_clock_get_time_request_t *req = args->smsg; mach_clock_get_time_reply_t *rep = args->rmsg; diff --git a/sys/compat/mach/mach_errno.c b/sys/compat/mach/mach_errno.c index 4c20b645741..c8a7207ba26 100644 --- a/sys/compat/mach/mach_errno.c +++ b/sys/compat/mach/mach_errno.c @@ -1,4 +1,4 @@ -/* $NetBSD: mach_errno.c,v 1.16 2005/12/11 12:20:20 christos Exp $ */ +/* $NetBSD: mach_errno.c,v 1.17 2007/12/08 18:36:13 dsl Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mach_errno.c,v 1.16 2005/12/11 12:20:20 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mach_errno.c,v 1.17 2007/12/08 18:36:13 dsl Exp $"); #include <sys/types.h> #include <sys/systm.h> @@ -139,9 +139,7 @@ int native_to_mach_errno[] = { }; int -mach_msg_error(args, error) - struct mach_trap_args *args; - int error; +mach_msg_error(struct mach_trap_args *args, int error) { mach_msg_header_t *req = args->smsg; mach_error_reply_t *rep = args->rmsg; @@ -163,9 +161,7 @@ mach_msg_error(args, error) } int -mach_iokit_error(args, error) - struct mach_trap_args *args; - int error; +mach_iokit_error(struct mach_trap_args *args, int error) { mach_msg_header_t *req = args->smsg; mach_error_reply_t *rep = args->rmsg; diff --git a/sys/compat/mach/mach_exception.c b/sys/compat/mach/mach_exception.c index 8e7634108c3..160b9efd994 100644 --- a/sys/compat/mach/mach_exception.c +++ b/sys/compat/mach/mach_exception.c @@ -1,4 +1,4 @@ -/* $NetBSD: mach_exception.c,v 1.11 2007/12/05 08:33:23 ad Exp $ */ +/* $NetBSD: mach_exception.c,v 1.12 2007/12/08 18:36:13 dsl Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mach_exception.c,v 1.11 2007/12/05 08:33:23 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mach_exception.c,v 1.12 2007/12/08 18:36:13 dsl Exp $"); #include "opt_compat_darwin.h" @@ -404,9 +404,7 @@ out: } static void -mach_siginfo_to_exception(ksi, code) - const struct ksiginfo *ksi; - int *code; +mach_siginfo_to_exception(const struct ksiginfo *ksi, int *code) { code[1] = (long)ksi->ksi_addr; switch (ksi->ksi_signo) { @@ -479,8 +477,7 @@ mach_siginfo_to_exception(ksi, code) } int -mach_exception_raise(args) - struct mach_trap_args *args; +mach_exception_raise(struct mach_trap_args *args) { struct lwp *l = args->l; mach_exception_raise_reply_t *rep; @@ -530,15 +527,13 @@ mach_exception_raise(args) } int -mach_exception_raise_state(args) - struct mach_trap_args *args; +mach_exception_raise_state(struct mach_trap_args *args) { return mach_exception_raise(args); } int -mach_exception_raise_state_identity(args) - struct mach_trap_args *args; +mach_exception_raise_state_identity(struct mach_trap_args *args) { return mach_exception_raise(args); } diff --git a/sys/compat/mach/mach_exec.c b/sys/compat/mach/mach_exec.c index 09ae1444792..2463b2dd307 100644 --- a/sys/compat/mach/mach_exec.c +++ b/sys/compat/mach/mach_exec.c @@ -1,4 +1,4 @@ -/* $NetBSD: mach_exec.c,v 1.65 2007/12/05 08:33:24 ad Exp $ */ +/* $NetBSD: mach_exec.c,v 1.66 2007/12/08 18:36:14 dsl Exp $ */ /*- * Copyright (c) 2001-2003 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mach_exec.c,v 1.65 2007/12/05 08:33:24 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mach_exec.c,v 1.66 2007/12/08 18:36:14 dsl Exp $"); #include "opt_syscall_debug.h" @@ -133,12 +133,7 @@ const struct emul emul_mach = { * emulation, and it probably contains Darwin specific bits. */ int -exec_mach_copyargs(l, pack, arginfo, stackp, argp) - struct lwp *l; - struct exec_package *pack; - struct ps_strings *arginfo; - char **stackp; - void *argp; +exec_mach_copyargs(struct lwp *l, struct exec_package *pack, struct ps_strings *arginfo, char **stackp, void *argp) { struct exec_macho_emul_arg *emea; struct exec_macho_object_header *macho_hdr; @@ -190,17 +185,14 @@ exec_mach_copyargs(l, pack, arginfo, stackp, argp) } int -exec_mach_probe(path) - const char **path; +exec_mach_probe(const char **path) { *path = emul_mach.e_path; return 0; } void -mach_e_proc_exec(p, epp) - struct proc *p; - struct exec_package *epp; +mach_e_proc_exec(struct proc *p, struct exec_package *epp) { mach_e_proc_init(p, p->p_vmspace); @@ -218,10 +210,7 @@ mach_e_proc_fork(struct proc *p, struct proc *parent, int forkflags) } void -mach_e_proc_fork1(p, parent, allocate) - struct proc *p; - struct proc *parent; - int allocate; +mach_e_proc_fork1(struct proc *p, struct proc *parent, int allocate) { struct mach_emuldata *med1; struct mach_emuldata *med2; @@ -360,8 +349,7 @@ mach_e_proc_init(struct proc *p, struct vmspace *vmspace) } void -mach_e_proc_exit(p) - struct proc *p; +mach_e_proc_exit(struct proc *p) { struct mach_emuldata *med; struct mach_right *mr; @@ -436,8 +424,7 @@ mach_e_lwp_fork(struct lwp *l1, struct lwp *l2) } void -mach_e_lwp_exit(l) - struct lwp *l; +mach_e_lwp_exit(struct lwp *l) { struct mach_lwp_emuldata *mle; diff --git a/sys/compat/mach/mach_host.c b/sys/compat/mach/mach_host.c index 2a809aa5719..cd6da28c0da 100644 --- a/sys/compat/mach/mach_host.c +++ b/sys/compat/mach/mach_host.c @@ -1,4 +1,4 @@ -/* $NetBSD: mach_host.c,v 1.29 2005/12/11 12:20:20 christos Exp $ */ +/* $NetBSD: mach_host.c,v 1.30 2007/12/08 18:36:14 dsl Exp $ */ /*- * Copyright (c) 2002-2003 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mach_host.c,v 1.29 2005/12/11 12:20:20 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mach_host.c,v 1.30 2007/12/08 18:36:14 dsl Exp $"); #include <sys/types.h> #include <sys/malloc.h> @@ -58,8 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: mach_host.c,v 1.29 2005/12/11 12:20:20 christos Exp #include <compat/mach/mach_services.h> int -mach_host_info(args) - struct mach_trap_args *args; +mach_host_info(struct mach_trap_args *args) { mach_host_info_request_t *req = args->smsg; mach_host_info_reply_t *rep = args->rmsg; @@ -130,8 +129,7 @@ mach_host_info(args) int -mach_host_page_size(args) - struct mach_trap_args *args; +mach_host_page_size(struct mach_trap_args *args) { mach_host_page_size_request_t *req = args->smsg; mach_host_page_size_reply_t *rep = args->rmsg; @@ -148,8 +146,7 @@ mach_host_page_size(args) } int -mach_host_get_clock_service(args) - struct mach_trap_args *args; +mach_host_get_clock_service(struct mach_trap_args *args) { mach_host_get_clock_service_request_t *req = args->smsg; mach_host_get_clock_service_reply_t *rep = args->rmsg; @@ -168,8 +165,7 @@ mach_host_get_clock_service(args) } void -mach_host_priority_info(info) - struct mach_host_priority_info *info; +mach_host_priority_info(struct mach_host_priority_info *info) { /* XXX One day, try to fill this correctly */ info->kernel_priority = 0x50; @@ -185,8 +181,7 @@ mach_host_priority_info(info) } int -mach_host_get_io_master(args) - struct mach_trap_args *args; +mach_host_get_io_master(struct mach_trap_args *args) { mach_host_get_io_master_request_t *req = args->smsg; mach_host_get_io_master_reply_t *rep = args->rmsg; @@ -205,8 +200,7 @@ mach_host_get_io_master(args) } int -mach_processor_set_default(args) - struct mach_trap_args *args; +mach_processor_set_default(struct mach_trap_args *args) { mach_processor_set_default_request_t *req = args->smsg; mach_processor_set_default_reply_t *rep = args->rmsg; @@ -227,8 +221,7 @@ mach_processor_set_default(args) } int -mach_host_processor_set_priv(args) - struct mach_trap_args *args; +mach_host_processor_set_priv(struct mach_trap_args *args) { mach_host_processor_set_priv_request_t *req = args->smsg; mach_host_processor_set_priv_reply_t *rep = args->rmsg; diff --git a/sys/compat/mach/mach_iokit.c b/sys/compat/mach/mach_iokit.c index 559ec5a7746..ea3fec3d38a 100644 --- a/sys/compat/mach/mach_iokit.c +++ b/sys/compat/mach/mach_iokit.c @@ -1,4 +1,4 @@ -/* $NetBSD: mach_iokit.c,v 1.34 2006/03/07 03:32:06 thorpej Exp $ */ +/* $NetBSD: mach_iokit.c,v 1.35 2007/12/08 18:36:14 dsl Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ #include "opt_compat_darwin.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mach_iokit.c,v 1.34 2006/03/07 03:32:06 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mach_iokit.c,v 1.35 2007/12/08 18:36:14 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -89,8 +89,7 @@ static int mach_fill_parent_iterator(struct mach_device_iterator *, int, int, struct mach_iokit_devclass *); int -mach_io_service_get_matching_services(args) - struct mach_trap_args *args; +mach_io_service_get_matching_services(struct mach_trap_args *args) { mach_io_service_get_matching_services_request_t *req = args->smsg; mach_io_service_get_matching_services_reply_t *rep = args->rmsg; @@ -144,8 +143,7 @@ mach_io_service_get_matching_services(args) } int -mach_io_iterator_next(args) - struct mach_trap_args *args; +mach_io_iterator_next(struct mach_trap_args *args) { mach_io_iterator_next_request_t *req = args->smsg; mach_io_iterator_next_reply_t *rep = args->rmsg; @@ -185,8 +183,7 @@ mach_io_iterator_next(args) } int -mach_io_service_open(args) - struct mach_trap_args *args; +mach_io_service_open(struct mach_trap_args *args) { mach_io_service_open_request_t *req = args->smsg; mach_io_service_open_reply_t *rep = args->rmsg; @@ -217,8 +214,7 @@ mach_io_service_open(args) } int -mach_io_connect_method_scalari_scalaro(args) - struct mach_trap_args *args; +mach_io_connect_method_scalari_scalaro(struct mach_trap_args *args) { mach_io_connect_method_scalari_scalaro_request_t *req = args->smsg; struct lwp *l = args->l; @@ -258,8 +254,7 @@ mach_io_connect_method_scalari_scalaro(args) } int -mach_io_connect_get_service(args) - struct mach_trap_args *args; +mach_io_connect_get_service(struct mach_trap_args *args) { mach_io_connect_get_service_request_t *req = args->smsg; mach_io_connect_get_service_reply_t *rep = args->rmsg; @@ -296,8 +291,7 @@ mach_io_connect_get_service(args) } int -mach_io_registry_entry_create_iterator(args) - struct mach_trap_args *args; +mach_io_registry_entry_create_iterator(struct mach_trap_args *args) { mach_io_registry_entry_create_iterator_request_t *req = args->smsg; mach_io_registry_entry_create_iterator_reply_t *rep = args->rmsg; @@ -372,8 +366,7 @@ mach_io_registry_entry_create_iterator(args) } int -mach_io_object_conforms_to(args) - struct mach_trap_args *args; +mach_io_object_conforms_to(struct mach_trap_args *args) { mach_io_object_conforms_to_request_t *req = args->smsg; mach_io_object_conforms_to_reply_t *rep = args->rmsg; @@ -403,8 +396,7 @@ mach_io_object_conforms_to(args) } int -mach_io_service_add_interest_notification(args) - struct mach_trap_args *args; +mach_io_service_add_interest_notification(struct mach_trap_args *args) { mach_io_service_add_interest_notification_request_t *req = args->smsg; mach_io_service_add_interest_notification_reply_t *rep = args->rmsg; @@ -453,8 +445,7 @@ mach_io_service_add_interest_notification(args) } int -mach_io_connect_set_notification_port(args) - struct mach_trap_args *args; +mach_io_connect_set_notification_port(struct mach_trap_args *args) { mach_io_connect_set_notification_port_request_t *req = args->smsg; mach_io_connect_set_notification_port_reply_t *rep = args->rmsg; @@ -496,8 +487,7 @@ mach_io_connect_set_notification_port(args) } int -mach_io_registry_get_root_entry(args) - struct mach_trap_args *args; +mach_io_registry_get_root_entry(struct mach_trap_args *args) { mach_io_registry_get_root_entry_request_t *req = args->smsg; mach_io_registry_get_root_entry_reply_t *rep = args->rmsg; @@ -522,8 +512,7 @@ mach_io_registry_get_root_entry(args) } int -mach_io_registry_entry_get_child_iterator(args) - struct mach_trap_args *args; +mach_io_registry_entry_get_child_iterator(struct mach_trap_args *args) { mach_io_registry_entry_get_child_iterator_request_t *req = args->smsg; mach_io_registry_entry_get_child_iterator_reply_t *rep = args->rmsg; @@ -576,8 +565,7 @@ mach_io_registry_entry_get_child_iterator(args) } int -mach_io_registry_entry_get_name_in_plane(args) - struct mach_trap_args *args; +mach_io_registry_entry_get_name_in_plane(struct mach_trap_args *args) { mach_io_registry_entry_get_name_in_plane_request_t *req = args->smsg; mach_io_registry_entry_get_name_in_plane_reply_t *rep = args->rmsg; @@ -617,8 +605,7 @@ mach_io_registry_entry_get_name_in_plane(args) } int -mach_io_object_get_class(args) - struct mach_trap_args *args; +mach_io_object_get_class(struct mach_trap_args *args) { mach_io_object_get_class_request_t *req = args->smsg; mach_io_object_get_class_reply_t *rep = args->rmsg; @@ -640,8 +627,7 @@ mach_io_object_get_class(args) } int -mach_io_registry_entry_get_location_in_plane(args) - struct mach_trap_args *args; +mach_io_registry_entry_get_location_in_plane(struct mach_trap_args *args) { mach_io_registry_entry_get_location_in_plane_request_t *req = args->smsg; @@ -671,8 +657,7 @@ mach_io_registry_entry_get_location_in_plane(args) } int -mach_io_registry_entry_get_properties(args) - struct mach_trap_args *args; +mach_io_registry_entry_get_properties(struct mach_trap_args *args) { mach_io_registry_entry_get_properties_request_t *req = args->smsg; mach_io_registry_entry_get_properties_reply_t *rep = args->rmsg; @@ -717,8 +702,7 @@ mach_io_registry_entry_get_properties(args) } int -mach_io_registry_entry_get_property(args) - struct mach_trap_args *args; +mach_io_registry_entry_get_property(struct mach_trap_args *args) { mach_io_registry_entry_get_property_request_t *req = args->smsg; mach_io_registry_entry_get_property_reply_t *rep = args->rmsg; @@ -785,8 +769,7 @@ mach_io_registry_entry_get_property(args) } int -mach_io_registry_entry_get_path(args) - struct mach_trap_args *args; +mach_io_registry_entry_get_path(struct mach_trap_args *args) { mach_io_registry_entry_get_path_request_t *req = args->smsg; mach_io_registry_entry_get_path_reply_t *rep = args->rmsg; @@ -833,8 +816,7 @@ mach_io_registry_entry_get_path(args) } int -mach_io_connect_map_memory(args) - struct mach_trap_args *args; +mach_io_connect_map_memory(struct mach_trap_args *args) { mach_io_connect_map_memory_request_t *req = args->smsg; struct lwp *l = args->l; @@ -859,8 +841,7 @@ mach_io_connect_map_memory(args) } int -mach_io_iterator_reset(args) - struct mach_trap_args *args; +mach_io_iterator_reset(struct mach_trap_args *args) { mach_io_iterator_reset_request_t *req = args->smsg; mach_io_iterator_reset_reply_t *rep = args->rmsg; @@ -891,8 +872,7 @@ mach_io_iterator_reset(args) } int -mach_io_connect_method_scalari_structo(args) - struct mach_trap_args *args; +mach_io_connect_method_scalari_structo(struct mach_trap_args *args) { mach_io_connect_method_scalari_structo_request_t *req = args->smsg; struct lwp *l = args->l; @@ -928,8 +908,7 @@ mach_io_connect_method_scalari_structo(args) } int -mach_io_connect_method_structi_structo(args) - struct mach_trap_args *args; +mach_io_connect_method_structi_structo(struct mach_trap_args *args) { mach_io_connect_method_structi_structo_request_t *req = args->smsg; struct lwp *l = args->l; @@ -967,8 +946,7 @@ mach_io_connect_method_structi_structo(args) } int -mach_io_connect_set_properties(args) - struct mach_trap_args *args; +mach_io_connect_set_properties(struct mach_trap_args *args) { mach_io_connect_set_properties_request_t *req = args->smsg; mach_io_connect_set_properties_reply_t *rep = args->rmsg; @@ -987,8 +965,7 @@ mach_io_connect_set_properties(args) } int -mach_io_service_close(args) - struct mach_trap_args *args; +mach_io_service_close(struct mach_trap_args *args) { mach_io_service_close_request_t *req = args->smsg; mach_io_service_close_reply_t *rep = args->rmsg; @@ -1009,8 +986,7 @@ mach_io_service_close(args) } int -mach_io_connect_add_client(args) - struct mach_trap_args *args; +mach_io_connect_add_client(struct mach_trap_args *args) { mach_io_connect_add_client_request_t *req = args->smsg; mach_io_connect_add_client_reply_t *rep = args->rmsg; @@ -1031,8 +1007,7 @@ mach_io_connect_add_client(args) } int -mach_io_connect_method_scalari_structi(args) - struct mach_trap_args *args; +mach_io_connect_method_scalari_structi(struct mach_trap_args *args) { mach_io_connect_method_scalari_structi_request_t *req = args->smsg; struct lwp *l = args->l; @@ -1073,8 +1048,7 @@ mach_io_connect_method_scalari_structi(args) } int -mach_io_registry_entry_from_path(args) - struct mach_trap_args *args; +mach_io_registry_entry_from_path(struct mach_trap_args *args) { mach_io_registry_entry_from_path_request_t *req = args->smsg; mach_io_registry_entry_from_path_reply_t *rep = args->rmsg; @@ -1127,8 +1101,7 @@ mach_io_registry_entry_from_path(args) } int -mach_io_registry_entry_get_parent_iterator(args) - struct mach_trap_args *args; +mach_io_registry_entry_get_parent_iterator(struct mach_trap_args *args) { mach_io_registry_entry_get_parent_iterator_request_t *req = args->smsg; mach_io_registry_entry_get_parent_iterator_reply_t *rep = args->rmsg; @@ -1187,8 +1160,7 @@ mach_io_registry_entry_get_parent_iterator(args) } void -mach_iokit_cleanup_notify(mr) - struct mach_right *mr; +mach_iokit_cleanup_notify(struct mach_right *mr) { int i; struct mach_iokit_devclass *mid; @@ -1202,11 +1174,7 @@ mach_iokit_cleanup_notify(mr) } static int -mach_fill_child_iterator(mdi, size, index, mid) - struct mach_device_iterator *mdi; - int size; - int index; - struct mach_iokit_devclass *mid; +mach_fill_child_iterator(struct mach_device_iterator *mdi, int size, int index, struct mach_iokit_devclass *mid) { struct mach_iokit_devclass **midp; struct mach_iokit_devclass **midq; @@ -1231,11 +1199,7 @@ mach_fill_child_iterator(mdi, size, index, mid) } static int -mach_fill_parent_iterator(mdi, size, index, mid) - struct mach_device_iterator *mdi; - int size; - int index; - struct mach_iokit_devclass *mid; +mach_fill_parent_iterator(struct mach_device_iterator *mdi, int size, int index, struct mach_iokit_devclass *mid) { struct mach_iokit_devclass **midp; diff --git a/sys/compat/mach/mach_message.c b/sys/compat/mach/mach_message.c index 8537620c8d2..a78ffbdb3cb 100644 --- a/sys/compat/mach/mach_message.c +++ b/sys/compat/mach/mach_message.c @@ -1,4 +1,4 @@ -/* $NetBSD: mach_message.c,v 1.53 2007/12/05 08:33:27 ad Exp $ */ +/* $NetBSD: mach_message.c,v 1.54 2007/12/08 18:36:14 dsl Exp $ */ /*- * Copyright (c) 2002-2003 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mach_message.c,v 1.53 2007/12/05 08:33:27 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mach_message.c,v 1.54 2007/12/08 18:36:14 dsl Exp $"); #include "opt_compat_mach.h" /* For COMPAT_MACH in <sys/ktrace.h> */ #include "opt_compat_darwin.h" @@ -83,10 +83,7 @@ static inline int mach_trade_rights_complex(struct lwp *, struct mach_message *); int -mach_sys_msg_overwrite_trap(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +mach_sys_msg_overwrite_trap(struct lwp *l, void *v, register_t *retval) { struct mach_sys_msg_overwrite_trap_args /* { syscallarg(mach_msg_header_t *) msg; @@ -151,11 +148,7 @@ mach_sys_msg_overwrite_trap(l, v, retval) * Send a Mach message. This returns a Mach message error code. */ static inline int -mach_msg_send(l, msg, option, send_size) - struct lwp *l; - mach_msg_header_t *msg; - int *option; - size_t send_size; +mach_msg_send(struct lwp *l, mach_msg_header_t *msg, int *option, size_t send_size) { struct mach_emuldata *med; struct mach_port *mp; @@ -412,13 +405,7 @@ out1: * Receive a Mach message. This returns a Mach message error code. */ static inline int -mach_msg_recv(l, urm, option, recv_size, timeout, mn) - struct lwp *l; - mach_msg_header_t *urm; - int option; - size_t recv_size; - unsigned int timeout; - mach_port_t mn; +mach_msg_recv(struct lwp *l, mach_msg_header_t *urm, int option, size_t recv_size, unsigned int timeout, mach_port_t mn) { struct mach_port *mp; #if defined(DEBUG_MACH_MSG) || defined(KTRACE) @@ -661,10 +648,7 @@ unlock: int -mach_sys_msg_trap(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +mach_sys_msg_trap(struct lwp *l, void *v, register_t *retval) { struct mach_sys_msg_trap_args /* { syscallarg(mach_msg_header_t *) msg; @@ -691,9 +675,7 @@ mach_sys_msg_trap(l, v, retval) } static inline struct lwp * -mach_get_target_task(l, mp) - struct lwp *l; - struct mach_port *mp; +mach_get_target_task(struct lwp *l, struct mach_port *mp) { struct proc *tp; struct lwp *tl; @@ -717,9 +699,7 @@ mach_get_target_task(l, mp) } static inline void -mach_drop_rights(mr, bits) - struct mach_right *mr; - int bits; +mach_drop_rights(struct mach_right *mr, int bits) { int rights; @@ -820,9 +800,7 @@ mach_trade_rights(ll, rl, mnp, bits) * is not done yet. */ static inline int -mach_trade_rights_complex(l, mm) - struct lwp *l; - struct mach_message *mm; +mach_trade_rights_complex(struct lwp *l, struct mach_message *mm) { struct mach_complex_msg *mcm; unsigned int i, count; @@ -943,12 +921,7 @@ mach_trade_rights_complex(l, mm) } inline int -mach_ool_copyin(l, uaddr, kaddr, size, flags) - struct lwp *l; - const void *uaddr; - void **kaddr; - size_t size; - int flags; +mach_ool_copyin(struct lwp *l, const void *uaddr, void **kaddr, size_t size, int flags) { int error; void *kbuf; @@ -985,12 +958,7 @@ mach_ool_copyin(l, uaddr, kaddr, size, flags) } inline int -mach_ool_copyout(l, kaddr, uaddr, size, flags) - struct lwp *l; - const void *kaddr; - void **uaddr; - size_t size; - int flags; +mach_ool_copyout(struct lwp *l, const void *kaddr, void **uaddr, size_t size, int flags) { vaddr_t ubuf; int error = 0; @@ -1042,9 +1010,7 @@ out: inline void -mach_set_trailer(msgh, size) - void *msgh; - size_t size; +mach_set_trailer(void *msgh, size_t size) { mach_msg_trailer_t *trailer; char *msg = (char *)msgh; @@ -1057,10 +1023,7 @@ mach_set_trailer(msgh, size) } inline void -mach_set_header(rep, req, size) - void *rep; - void *req; - size_t size; +mach_set_header(void *rep, void *req, size_t size) { mach_msg_header_t *rephdr = rep; mach_msg_header_t *reqhdr = req; @@ -1076,9 +1039,7 @@ mach_set_header(rep, req, size) } inline void -mach_add_port_desc(msg, name) - void *msg; - mach_port_name_t name; +mach_add_port_desc(void *msg, mach_port_name_t name) { struct mach_complex_msg *mcm = msg; int i; @@ -1099,10 +1060,7 @@ mach_add_port_desc(msg, name) } inline void -mach_add_ool_ports_desc(msg, addr, count) - void *msg; - void *addr; - int count; +mach_add_ool_ports_desc(void *msg, void *addr, int count) { struct mach_complex_msg *mcm = msg; int i; @@ -1158,11 +1116,7 @@ mach_message_init(void) } struct mach_message * -mach_message_get(msgh, size, mp, l) - mach_msg_header_t *msgh; - size_t size; - struct mach_port *mp; - struct lwp *l; +mach_message_get(mach_msg_header_t *msgh, size_t size, struct mach_port *mp, struct lwp *l) { struct mach_message *mm; @@ -1182,8 +1136,7 @@ mach_message_get(msgh, size, mp, l) } void -mach_message_put(mm) - struct mach_message *mm; +mach_message_put(struct mach_message *mm) { struct mach_port *mp; @@ -1197,8 +1150,7 @@ mach_message_put(mm) } void -mach_message_put_shlocked(mm) - struct mach_message *mm; +mach_message_put_shlocked(struct mach_message *mm) { struct mach_port *mp; @@ -1216,8 +1168,7 @@ mach_message_put_shlocked(mm) } void -mach_message_put_exclocked(mm) - struct mach_message *mm; +mach_message_put_exclocked(struct mach_message *mm) { struct mach_port *mp; diff --git a/sys/compat/mach/mach_notify.c b/sys/compat/mach/mach_notify.c index 78e873f3d69..9bf08ff36f7 100644 --- a/sys/compat/mach/mach_notify.c +++ b/sys/compat/mach/mach_notify.c @@ -1,4 +1,4 @@ -/* $NetBSD: mach_notify.c,v 1.18 2006/03/07 03:32:06 thorpej Exp $ */ +/* $NetBSD: mach_notify.c,v 1.19 2007/12/08 18:36:15 dsl Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mach_notify.c,v 1.18 2006/03/07 03:32:06 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mach_notify.c,v 1.19 2007/12/08 18:36:15 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -53,9 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: mach_notify.c,v 1.18 2006/03/07 03:32:06 thorpej Exp #include <compat/mach/mach_services.h> void -mach_notify_port_destroyed(l, mr) - struct lwp *l; - struct mach_right *mr; +mach_notify_port_destroyed(struct lwp *l, struct mach_right *mr) { struct mach_port *mp; mach_notify_port_destroyed_request_t *req; @@ -100,9 +98,7 @@ mach_notify_port_destroyed(l, mr) } void -mach_notify_port_no_senders(l, mr) - struct lwp *l; - struct mach_right *mr; +mach_notify_port_no_senders(struct lwp *l, struct mach_right *mr) { struct mach_port *mp; mach_notify_port_no_senders_request_t *req; @@ -149,9 +145,7 @@ out: } void -mach_notify_port_dead_name(l, mr) - struct lwp *l; - struct mach_right *mr; +mach_notify_port_dead_name(struct lwp *l, struct mach_right *mr) { struct mach_port *mp; mach_notify_port_dead_name_request_t *req; diff --git a/sys/compat/mach/mach_port.c b/sys/compat/mach/mach_port.c index 47dac1b67ae..b65e805d543 100644 --- a/sys/compat/mach/mach_port.c +++ b/sys/compat/mach/mach_port.c @@ -1,4 +1,4 @@ -/* $NetBSD: mach_port.c,v 1.62 2007/12/05 08:33:30 ad Exp $ */ +/* $NetBSD: mach_port.c,v 1.63 2007/12/08 18:36:15 dsl Exp $ */ /*- * Copyright (c) 2002-2003 The NetBSD Foundation, Inc. @@ -39,7 +39,7 @@ #include "opt_compat_darwin.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mach_port.c,v 1.62 2007/12/05 08:33:30 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mach_port.c,v 1.63 2007/12/08 18:36:15 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -127,8 +127,7 @@ mach_sys_host_self_trap(struct lwp *l, void *v, register_t *retval) } int -mach_port_deallocate(args) - struct mach_trap_args *args; +mach_port_deallocate(struct mach_trap_args *args) { mach_port_deallocate_request_t *req = args->smsg; mach_port_deallocate_reply_t *rep = args->rmsg; @@ -152,8 +151,7 @@ mach_port_deallocate(args) } int -mach_port_destroy(args) - struct mach_trap_args *args; +mach_port_destroy(struct mach_trap_args *args) { mach_port_destroy_request_t *req = args->smsg; mach_port_destroy_reply_t *rep = args->rmsg; @@ -184,8 +182,7 @@ mach_port_destroy(args) } int -mach_port_allocate(args) - struct mach_trap_args *args; +mach_port_allocate(struct mach_trap_args *args) { mach_port_allocate_request_t *req = args->smsg; mach_port_allocate_reply_t *rep = args->rmsg; @@ -227,8 +224,7 @@ mach_port_allocate(args) } int -mach_port_insert_right(args) - struct mach_trap_args *args; +mach_port_insert_right(struct mach_trap_args *args) { mach_port_insert_right_request_t *req = args->smsg; mach_port_insert_right_reply_t *rep = args->rmsg; @@ -283,8 +279,7 @@ mach_port_insert_right(args) } int -mach_port_type(args) - struct mach_trap_args *args; +mach_port_type(struct mach_trap_args *args) { mach_port_type_request_t *req = args->smsg; mach_port_type_reply_t *rep = args->rmsg; @@ -309,8 +304,7 @@ mach_port_type(args) } int -mach_port_set_attributes(args) - struct mach_trap_args *args; +mach_port_set_attributes(struct mach_trap_args *args) { mach_port_set_attributes_request_t *req = args->smsg; mach_port_set_attributes_reply_t *rep = args->rmsg; @@ -344,8 +338,7 @@ mach_port_set_attributes(args) } int -mach_port_get_attributes(args) - struct mach_trap_args *args; +mach_port_get_attributes(struct mach_trap_args *args) { mach_port_get_attributes_request_t *req = args->smsg; mach_port_get_attributes_reply_t *rep = args->rmsg; @@ -430,8 +423,7 @@ mach_port_get_attributes(args) /* XXX insert a recv right into a port set without removing it from another */ int -mach_port_insert_member(args) - struct mach_trap_args *args; +mach_port_insert_member(struct mach_trap_args *args) { mach_port_insert_member_request_t *req = args->smsg; mach_port_insert_member_reply_t *rep = args->rmsg; @@ -450,8 +442,7 @@ mach_port_insert_member(args) } int -mach_port_move_member(args) - struct mach_trap_args *args; +mach_port_move_member(struct mach_trap_args *args) { mach_port_move_member_request_t *req = args->smsg; mach_port_move_member_reply_t *rep = args->rmsg; @@ -494,8 +485,7 @@ mach_port_move_member(args) } int -mach_port_request_notification(args) - struct mach_trap_args *args; +mach_port_request_notification(struct mach_trap_args *args) { mach_port_request_notification_request_t *req = args->smsg; mach_port_request_notification_reply_t *rep = args->rmsg; @@ -578,8 +568,7 @@ mach_port_request_notification(args) } int -mach_port_get_refs(args) - struct mach_trap_args *args; +mach_port_get_refs(struct mach_trap_args *args) { mach_port_get_refs_request_t *req = args->smsg; mach_port_get_refs_reply_t *rep = args->rmsg; @@ -605,8 +594,7 @@ mach_port_get_refs(args) } int -mach_port_mod_refs(args) - struct mach_trap_args *args; +mach_port_mod_refs(struct mach_trap_args *args) { mach_port_mod_refs_request_t *req = args->smsg; mach_port_mod_refs_reply_t *rep = args->rmsg; @@ -681,8 +669,7 @@ mach_port_get(void) } void -mach_port_put(mp) - struct mach_port *mp; +mach_port_put(struct mach_port *mp) { struct mach_message *mm; @@ -708,11 +695,7 @@ mach_port_put(mp) } struct mach_right * -mach_right_get(mp, l, type, hint) - struct mach_port *mp; - struct lwp *l; - int type; - mach_port_t hint; +mach_right_get(struct mach_port *mp, struct lwp *l, int type, mach_port_t hint) { struct mach_right *mr; struct mach_emuldata *med; @@ -785,9 +768,7 @@ rcvck: } void -mach_right_put(mr, right) - struct mach_right *mr; - int right; +mach_right_put(struct mach_right *mr, int right) { struct mach_emuldata *med = mr->mr_lwp->l_proc->p_emuldata; @@ -799,9 +780,7 @@ mach_right_put(mr, right) } void -mach_right_put_shlocked(mr, right) - struct mach_right *mr; - int right; +mach_right_put_shlocked(struct mach_right *mr, int right) { struct mach_emuldata *med = mr->mr_lwp->l_proc->p_emuldata; @@ -817,9 +796,7 @@ mach_right_put_shlocked(mr, right) } void -mach_right_put_exclocked(mr, right) - struct mach_right *mr; - int right; +mach_right_put_exclocked(struct mach_right *mr, int right) { struct mach_right *cmr; struct mach_emuldata *med; @@ -918,10 +895,7 @@ mach_right_put_exclocked(mr, right) * Check that a process has a given right. */ struct mach_right * -mach_right_check(mn, l, type) - mach_port_t mn; - struct lwp *l; - int type; +mach_right_check(mach_port_t mn, struct lwp *l, int type) { struct mach_right *cmr; struct mach_emuldata *med; @@ -958,9 +932,7 @@ mach_right_check(mn, l, type) * Right lists should be locked. */ mach_port_t -mach_right_newname(l, hint) - struct lwp *l; - mach_port_t hint; +mach_right_newname(struct lwp *l, mach_port_t hint) { struct mach_emuldata *med; struct mach_right *mr; diff --git a/sys/compat/mach/mach_semaphore.c b/sys/compat/mach/mach_semaphore.c index 87d9d9f14d7..1fdc1b5d7b8 100644 --- a/sys/compat/mach/mach_semaphore.c +++ b/sys/compat/mach/mach_semaphore.c @@ -1,4 +1,4 @@ -/* $NetBSD: mach_semaphore.c,v 1.16 2007/12/05 08:33:30 ad Exp $ */ +/* $NetBSD: mach_semaphore.c,v 1.17 2007/12/08 18:36:16 dsl Exp $ */ /*- * Copyright (c) 2002-2003 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mach_semaphore.c,v 1.16 2007/12/05 08:33:30 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mach_semaphore.c,v 1.17 2007/12/08 18:36:16 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -146,8 +146,7 @@ mach_sys_semaphore_signal_trap(struct lwp *l, void *v, } int -mach_semaphore_create(args) - struct mach_trap_args *args; +mach_semaphore_create(struct mach_trap_args *args) { mach_semaphore_create_request_t *req = args->smsg; mach_semaphore_create_reply_t *rep = args->rmsg; @@ -174,8 +173,7 @@ mach_semaphore_create(args) } int -mach_semaphore_destroy(args) - struct mach_trap_args *args; +mach_semaphore_destroy(struct mach_trap_args *args) { mach_semaphore_destroy_request_t *req = args->smsg; mach_semaphore_destroy_reply_t *rep = args->rmsg; @@ -220,9 +218,7 @@ mach_semaphore_init(void) } static struct mach_semaphore * -mach_semaphore_get(value, policy) - int value; - int policy; +mach_semaphore_get(int value, int policy) { struct mach_semaphore *ms; @@ -241,8 +237,7 @@ mach_semaphore_get(value, policy) } static void -mach_semaphore_put(ms) - struct mach_semaphore *ms; +mach_semaphore_put(struct mach_semaphore *ms) { struct mach_waiting_lwp *mwl; @@ -262,9 +257,7 @@ mach_semaphore_put(ms) } static struct mach_waiting_lwp * -mach_waiting_lwp_get(l, ms) - struct lwp *l; - struct mach_semaphore *ms; +mach_waiting_lwp_get(struct lwp *l, struct mach_semaphore *ms) { struct mach_waiting_lwp *mwl; @@ -280,10 +273,7 @@ mach_waiting_lwp_get(l, ms) } static void -mach_waiting_lwp_put(mwl, ms, locked) - struct mach_waiting_lwp *mwl; - struct mach_semaphore *ms; - int locked; +mach_waiting_lwp_put(struct mach_waiting_lwp *mwl, struct mach_semaphore *ms, int locked) { if (!locked) rw_enter(&ms->ms_lock, RW_WRITER); @@ -300,8 +290,7 @@ mach_waiting_lwp_put(mwl, ms, locked) * can be some memory leaks here. */ void -mach_semaphore_cleanup(l) - struct lwp *l; +mach_semaphore_cleanup(struct lwp *l) { struct mach_semaphore *ms; struct mach_waiting_lwp *mwl; @@ -324,10 +313,7 @@ mach_semaphore_cleanup(l) } int -mach_sys_semaphore_wait_signal_trap(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +mach_sys_semaphore_wait_signal_trap(struct lwp *l, void *v, register_t *retval) { struct mach_sys_semaphore_wait_signal_trap_args /* { syscallarg(mach_port_name_t) wait_name; diff --git a/sys/compat/mach/mach_task.c b/sys/compat/mach/mach_task.c index 82046371af1..fd52c375c79 100644 --- a/sys/compat/mach/mach_task.c +++ b/sys/compat/mach/mach_task.c @@ -1,4 +1,4 @@ -/* $NetBSD: mach_task.c,v 1.65 2007/02/17 22:31:41 pavel Exp $ */ +/* $NetBSD: mach_task.c,v 1.66 2007/12/08 18:36:16 dsl Exp $ */ /*- * Copyright (c) 2002-2003 The NetBSD Foundation, Inc. @@ -39,7 +39,7 @@ #include "opt_compat_darwin.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mach_task.c,v 1.65 2007/02/17 22:31:41 pavel Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mach_task.c,v 1.66 2007/12/08 18:36:16 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -76,8 +76,7 @@ static void update_exception_port(struct mach_emuldata *, int exc, struct mach_port *); int -mach_task_get_special_port(args) - struct mach_trap_args *args; +mach_task_get_special_port(struct mach_trap_args *args) { mach_task_get_special_port_request_t *req = args->smsg; mach_task_get_special_port_reply_t *rep = args->rmsg; @@ -121,8 +120,7 @@ mach_task_get_special_port(args) } int -mach_ports_lookup(args) - struct mach_trap_args *args; +mach_ports_lookup(struct mach_trap_args *args) { mach_ports_lookup_request_t *req = args->smsg; mach_ports_lookup_reply_t *rep = args->rmsg; @@ -177,8 +175,7 @@ mach_ports_lookup(args) } int -mach_task_set_special_port(args) - struct mach_trap_args *args; +mach_task_set_special_port(struct mach_trap_args *args) { mach_task_set_special_port_request_t *req = args->smsg; mach_task_set_special_port_reply_t *rep = args->rmsg; @@ -266,8 +263,7 @@ mach_task_set_special_port(args) } int -mach_task_threads(args) - struct mach_trap_args *args; +mach_task_threads(struct mach_trap_args *args) { mach_task_threads_request_t *req = args->smsg; mach_task_threads_reply_t *rep = args->rmsg; @@ -313,8 +309,7 @@ mach_task_threads(args) } int -mach_task_get_exception_ports(args) - struct mach_trap_args *args; +mach_task_get_exception_ports(struct mach_trap_args *args) { mach_task_get_exception_ports_request_t *req = args->smsg; mach_task_get_exception_ports_reply_t *rep = args->rmsg; @@ -366,10 +361,7 @@ mach_task_get_exception_ports(args) } static void -update_exception_port(med, exc, mp) - struct mach_emuldata *med; - int exc; - struct mach_port *mp; +update_exception_port(struct mach_emuldata *med, int exc, struct mach_port *mp) { if (med->med_exc[exc] != NULL) MACH_PORT_UNREF(med->med_exc[exc]); @@ -380,8 +372,7 @@ update_exception_port(med, exc, mp) } int -mach_task_set_exception_ports(args) - struct mach_trap_args *args; +mach_task_set_exception_ports(struct mach_trap_args *args) { mach_task_set_exception_ports_request_t *req = args->smsg; mach_task_set_exception_ports_reply_t *rep = args->rmsg; @@ -451,8 +442,7 @@ mach_task_set_exception_ports(args) } int -mach_task_info(args) - struct mach_trap_args *args; +mach_task_info(struct mach_trap_args *args) { mach_task_info_request_t *req = args->smsg; mach_task_info_reply_t *rep = args->rmsg; @@ -548,8 +538,7 @@ mach_task_info(args) } int -mach_task_suspend(args) - struct mach_trap_args *args; +mach_task_suspend(struct mach_trap_args *args) { mach_task_suspend_request_t *req = args->smsg; mach_task_suspend_reply_t *rep = args->rmsg; @@ -592,8 +581,7 @@ mach_task_suspend(args) } int -mach_task_resume(args) - struct mach_trap_args *args; +mach_task_resume(struct mach_trap_args *args) { mach_task_resume_request_t *req = args->smsg; mach_task_resume_reply_t *rep = args->rmsg; @@ -630,8 +618,7 @@ mach_task_resume(args) } int -mach_task_terminate(args) - struct mach_trap_args *args; +mach_task_terminate(struct mach_trap_args *args) { mach_task_resume_request_t *req = args->smsg; mach_task_resume_reply_t *rep = args->rmsg; diff --git a/sys/compat/mach/mach_thread.c b/sys/compat/mach/mach_thread.c index 2a171389ce4..3e7e93cad99 100644 --- a/sys/compat/mach/mach_thread.c +++ b/sys/compat/mach/mach_thread.c @@ -1,4 +1,4 @@ -/* $NetBSD: mach_thread.c,v 1.43 2007/12/05 08:33:30 ad Exp $ */ +/* $NetBSD: mach_thread.c,v 1.44 2007/12/08 18:36:16 dsl Exp $ */ /*- * Copyright (c) 2002-2003 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mach_thread.c,v 1.43 2007/12/05 08:33:30 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mach_thread.c,v 1.44 2007/12/08 18:36:16 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -142,8 +142,7 @@ mach_sys_swtch(struct lwp *l, void *v, register_t *retval) int -mach_thread_policy(args) - struct mach_trap_args *args; +mach_thread_policy(struct mach_trap_args *args) { mach_thread_policy_request_t *req = args->smsg; mach_thread_policy_reply_t *rep = args->rmsg; @@ -170,8 +169,7 @@ mach_thread_policy(args) /* XXX it might be possible to use this on another task */ int -mach_thread_create_running(args) - struct mach_trap_args *args; +mach_thread_create_running(struct mach_trap_args *args) { mach_thread_create_running_request_t *req = args->smsg; mach_thread_create_running_reply_t *rep = args->rmsg; @@ -250,8 +248,7 @@ mach_thread_create_running(args) } int -mach_thread_info(args) - struct mach_trap_args *args; +mach_thread_info(struct mach_trap_args *args) { mach_thread_info_request_t *req = args->smsg; mach_thread_info_reply_t *rep = args->rmsg; @@ -343,8 +340,7 @@ mach_thread_info(args) } int -mach_thread_get_state(args) - struct mach_trap_args *args; +mach_thread_get_state(struct mach_trap_args *args) { mach_thread_get_state_request_t *req = args->smsg; mach_thread_get_state_reply_t *rep = args->rmsg; @@ -370,8 +366,7 @@ mach_thread_get_state(args) } int -mach_thread_set_state(args) - struct mach_trap_args *args; +mach_thread_set_state(struct mach_trap_args *args) { mach_thread_set_state_request_t *req = args->smsg; mach_thread_set_state_reply_t *rep = args->rmsg; @@ -400,8 +395,7 @@ mach_thread_set_state(args) } int -mach_thread_suspend(args) - struct mach_trap_args *args; +mach_thread_suspend(struct mach_trap_args *args) { mach_thread_suspend_request_t *req = args->smsg; mach_thread_suspend_reply_t *rep = args->rmsg; @@ -425,8 +419,7 @@ mach_thread_suspend(args) } int -mach_thread_resume(args) - struct mach_trap_args *args; +mach_thread_resume(struct mach_trap_args *args) { mach_thread_resume_request_t *req = args->smsg; mach_thread_resume_reply_t *rep = args->rmsg; @@ -448,8 +441,7 @@ mach_thread_resume(args) } int -mach_thread_abort(args) - struct mach_trap_args *args; +mach_thread_abort(struct mach_trap_args *args) { mach_thread_abort_request_t *req = args->smsg; mach_thread_abort_reply_t *rep = args->rmsg; @@ -467,8 +459,7 @@ mach_thread_abort(args) } int -mach_thread_set_policy(args) - struct mach_trap_args *args; +mach_thread_set_policy(struct mach_trap_args *args) { mach_thread_set_policy_request_t *req = args->smsg; mach_thread_set_policy_reply_t *rep = args->rmsg; diff --git a/sys/compat/mach/mach_vm.c b/sys/compat/mach/mach_vm.c index c9ef6f19fed..338397942c3 100644 --- a/sys/compat/mach/mach_vm.c +++ b/sys/compat/mach/mach_vm.c @@ -1,4 +1,4 @@ -/* $NetBSD: mach_vm.c,v 1.56 2007/08/15 12:07:30 ad Exp $ */ +/* $NetBSD: mach_vm.c,v 1.57 2007/12/08 18:36:16 dsl Exp $ */ /*- * Copyright (c) 2002-2003 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mach_vm.c,v 1.56 2007/08/15 12:07:30 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mach_vm.c,v 1.57 2007/12/08 18:36:16 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -67,8 +67,7 @@ __KERNEL_RCSID(0, "$NetBSD: mach_vm.c,v 1.56 2007/08/15 12:07:30 ad Exp $"); #include <compat/mach/mach_syscallargs.h> int -mach_vm_map(args) - struct mach_trap_args *args; +mach_vm_map(struct mach_trap_args *args) { mach_vm_map_request_t *req = args->smsg; mach_vm_map_reply_t *rep = args->rmsg; @@ -156,8 +155,7 @@ mach_vm_map(args) } int -mach_vm_allocate(args) - struct mach_trap_args *args; +mach_vm_allocate(struct mach_trap_args *args) { mach_vm_allocate_request_t *req = args->smsg; mach_vm_allocate_reply_t *rep = args->rmsg; @@ -231,8 +229,7 @@ out: } int -mach_vm_deallocate(args) - struct mach_trap_args *args; +mach_vm_deallocate(struct mach_trap_args *args) { mach_vm_deallocate_request_t *req = args->smsg; mach_vm_deallocate_reply_t *rep = args->rmsg; @@ -265,8 +262,7 @@ mach_vm_deallocate(args) */ #if 0 int -mach_vm_wire(args) - struct mach_trap_args *args; +mach_vm_wire(struct mach_trap_args *args) { mach_vm_wire_request_t *req = args->smsg; mach_vm_wire_reply_t *rep = args->rmsg; @@ -319,8 +315,7 @@ mach_vm_wire(args) #endif int -mach_vm_protect(args) - struct mach_trap_args *args; +mach_vm_protect(struct mach_trap_args *args) { mach_vm_protect_request_t *req = args->smsg; mach_vm_protect_reply_t *rep = args->rmsg; @@ -462,8 +457,7 @@ bad2: } int -mach_vm_inherit(args) - struct mach_trap_args *args; +mach_vm_inherit(struct mach_trap_args *args) { mach_vm_inherit_request_t *req = args->smsg; mach_vm_inherit_reply_t *rep = args->rmsg; @@ -489,8 +483,7 @@ mach_vm_inherit(args) } int -mach_make_memory_entry_64(args) - struct mach_trap_args *args; +mach_make_memory_entry_64(struct mach_trap_args *args) { mach_make_memory_entry_64_request_t *req = args->smsg; mach_make_memory_entry_64_reply_t *rep = args->rmsg; @@ -528,8 +521,7 @@ mach_make_memory_entry_64(args) } int -mach_vm_region(args) - struct mach_trap_args *args; +mach_vm_region(struct mach_trap_args *args) { mach_vm_region_request_t *req = args->smsg; mach_vm_region_reply_t *rep = args->rmsg; @@ -587,8 +579,7 @@ mach_vm_region(args) } int -mach_vm_region_64(args) - struct mach_trap_args *args; +mach_vm_region_64(struct mach_trap_args *args) { mach_vm_region_64_request_t *req = args->smsg; mach_vm_region_64_reply_t *rep = args->rmsg; @@ -645,8 +636,7 @@ mach_vm_region_64(args) } int -mach_vm_msync(args) - struct mach_trap_args *args; +mach_vm_msync(struct mach_trap_args *args) { mach_vm_msync_request_t *req = args->smsg; mach_vm_msync_reply_t *rep = args->rmsg; @@ -680,8 +670,7 @@ mach_vm_msync(args) /* XXX Do it for remote task */ int -mach_vm_copy(args) - struct mach_trap_args *args; +mach_vm_copy(struct mach_trap_args *args) { mach_vm_copy_request_t *req = args->smsg; mach_vm_copy_reply_t *rep = args->rmsg; @@ -735,8 +724,7 @@ out: } int -mach_vm_read(args) - struct mach_trap_args *args; +mach_vm_read(struct mach_trap_args *args) { mach_vm_read_request_t *req = args->smsg; mach_vm_read_reply_t *rep = args->rmsg; @@ -796,8 +784,7 @@ mach_vm_read(args) } int -mach_vm_write(args) - struct mach_trap_args *args; +mach_vm_write(struct mach_trap_args *args) { mach_vm_write_request_t *req = args->smsg; mach_vm_write_reply_t *rep = args->rmsg; @@ -850,8 +837,7 @@ mach_vm_write(args) } int -mach_vm_machine_attribute(args) - struct mach_trap_args *args; +mach_vm_machine_attribute(struct mach_trap_args *args) { mach_vm_machine_attribute_request_t *req = args->smsg; mach_vm_machine_attribute_reply_t *rep = args->rmsg; diff --git a/sys/compat/netbsd32/netbsd32_compat_09.c b/sys/compat/netbsd32/netbsd32_compat_09.c index 6f1dd1da07f..d6d32112018 100644 --- a/sys/compat/netbsd32/netbsd32_compat_09.c +++ b/sys/compat/netbsd32/netbsd32_compat_09.c @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_09.c,v 1.15 2007/03/18 21:38:33 dsl Exp $ */ +/* $NetBSD: netbsd32_compat_09.c,v 1.16 2007/12/08 18:36:17 dsl Exp $ */ /* * Copyright (c) 1998 Matthew R. Green @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_09.c,v 1.15 2007/03/18 21:38:33 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_09.c,v 1.16 2007/12/08 18:36:17 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -44,10 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_09.c,v 1.15 2007/03/18 21:38:33 dsl #include <compat/netbsd32/netbsd32_syscallargs.h> int -compat_09_netbsd32_ogetdomainname(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_09_netbsd32_ogetdomainname(struct lwp *l, void *v, register_t *retval) { struct compat_09_netbsd32_ogetdomainname_args /* { syscallarg(netbsd32_charp) domainname; @@ -64,10 +61,7 @@ compat_09_netbsd32_ogetdomainname(l, v, retval) } int -compat_09_netbsd32_osetdomainname(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_09_netbsd32_osetdomainname(struct lwp *l, void *v, register_t *retval) { struct compat_09_netbsd32_osetdomainname_args /* { syscallarg(netbsd32_charp) domainname; @@ -82,10 +76,7 @@ compat_09_netbsd32_osetdomainname(l, v, retval) } int -compat_09_netbsd32_uname(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_09_netbsd32_uname(struct lwp *l, void *v, register_t *retval) { struct compat_09_netbsd32_uname_args /* { syscallarg(netbsd32_outsnamep_t) name; diff --git a/sys/compat/netbsd32/netbsd32_compat_10.c b/sys/compat/netbsd32/netbsd32_compat_10.c index e61e144051b..0c9e74f4e97 100644 --- a/sys/compat/netbsd32/netbsd32_compat_10.c +++ b/sys/compat/netbsd32/netbsd32_compat_10.c @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_10.c,v 1.20 2007/06/03 10:55:10 dsl Exp $ */ +/* $NetBSD: netbsd32_compat_10.c,v 1.21 2007/12/08 18:36:17 dsl Exp $ */ /* * Copyright (c) 1994 Adam Glass and Charles M. Hannum. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_10.c,v 1.20 2007/06/03 10:55:10 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_10.c,v 1.21 2007/12/08 18:36:17 dsl Exp $"); #ifdef _KERNEL_OPT #include "opt_sysv.h" @@ -53,10 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_10.c,v 1.20 2007/06/03 10:55:10 dsl #if defined(SYSVSEM) || !defined(_KERNEL) int -compat_10_netbsd32_sys_semsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_10_netbsd32_sys_semsys(struct lwp *l, void *v, register_t *retval) { struct compat_10_netbsd32_sys_semsys_args /* { syscallarg(int) which; @@ -117,10 +114,7 @@ compat_10_netbsd32_sys_semsys(l, v, retval) #if defined(SYSVSHM) || !defined(_KERNEL) int -compat_10_netbsd32_sys_shmsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_10_netbsd32_sys_shmsys(struct lwp *l, void *v, register_t *retval) { struct compat_10_netbsd32_sys_shmsys_args /* { syscallarg(int) which; @@ -178,10 +172,7 @@ compat_10_netbsd32_sys_shmsys(l, v, retval) #if defined(SYSVMSG) || !defined(_KERNEL) int -compat_10_netbsd32_sys_msgsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_10_netbsd32_sys_msgsys(struct lwp *l, void *v, register_t *retval) { struct compat_10_netbsd32_sys_msgsys_args /* { syscallarg(int) which; diff --git a/sys/compat/netbsd32/netbsd32_compat_12.c b/sys/compat/netbsd32/netbsd32_compat_12.c index a8731ac2602..7ef1ea38947 100644 --- a/sys/compat/netbsd32/netbsd32_compat_12.c +++ b/sys/compat/netbsd32/netbsd32_compat_12.c @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_12.c,v 1.28 2007/12/04 18:40:19 dsl Exp $ */ +/* $NetBSD: netbsd32_compat_12.c,v 1.29 2007/12/08 18:36:17 dsl Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.28 2007/12/04 18:40:19 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_12.c,v 1.29 2007/12/08 18:36:17 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -54,9 +54,7 @@ static void netbsd32_stat12_to_netbsd32(struct stat12 *, /* for use with {,fl}stat() */ static void -netbsd32_stat12_to_netbsd32(sp12, sp32) - struct stat12 *sp12; - struct netbsd32_stat12 *sp32; +netbsd32_stat12_to_netbsd32(struct stat12 *sp12, struct netbsd32_stat12 *sp32) { sp32->st_dev = sp12->st_dev; @@ -83,10 +81,7 @@ netbsd32_stat12_to_netbsd32(sp12, sp32) } int -compat_12_netbsd32_reboot(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_12_netbsd32_reboot(struct lwp *l, void *v, register_t *retval) { struct compat_12_netbsd32_reboot_args /* { syscallarg(int) opt; @@ -98,10 +93,7 @@ compat_12_netbsd32_reboot(l, v, retval) } int -compat_12_netbsd32_msync(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_12_netbsd32_msync(struct lwp *l, void *v, register_t *retval) { struct compat_12_netbsd32_msync_args /* { syscallarg(netbsd32_caddr_t) addr; @@ -116,10 +108,7 @@ compat_12_netbsd32_msync(l, v, retval) } int -compat_12_netbsd32_oswapon(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_12_netbsd32_oswapon(struct lwp *l, void *v, register_t *retval) { struct compat_12_netbsd32_oswapon_args /* { syscallarg(const netbsd32_charp) name; @@ -133,10 +122,7 @@ compat_12_netbsd32_oswapon(l, v, retval) } int -compat_12_netbsd32_stat12(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_12_netbsd32_stat12(struct lwp *l, void *v, register_t *retval) { struct compat_12_netbsd32_stat12_args /* { syscallarg(const netbsd32_charp) path; @@ -162,10 +148,7 @@ compat_12_netbsd32_stat12(l, v, retval) } int -compat_12_netbsd32_fstat12(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_12_netbsd32_fstat12(struct lwp *l, void *v, register_t *retval) { struct compat_12_netbsd32_fstat12_args /* { syscallarg(int) fd; @@ -190,10 +173,7 @@ compat_12_netbsd32_fstat12(l, v, retval) } int -compat_12_netbsd32_lstat12(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_12_netbsd32_lstat12(struct lwp *l, void *v, register_t *retval) { struct compat_12_netbsd32_lstat12_args /* { syscallarg(const netbsd32_charp) path; @@ -219,10 +199,7 @@ compat_12_netbsd32_lstat12(l, v, retval) } int -compat_12_netbsd32_getdirentries(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_12_netbsd32_getdirentries(struct lwp *l, void *v, register_t *retval) { struct compat_12_netbsd32_getdirentries_args /* { syscallarg(int) fd; diff --git a/sys/compat/netbsd32/netbsd32_compat_13.c b/sys/compat/netbsd32/netbsd32_compat_13.c index cb7c0d46152..e89e737eb23 100644 --- a/sys/compat/netbsd32/netbsd32_compat_13.c +++ b/sys/compat/netbsd32/netbsd32_compat_13.c @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_13.c,v 1.22 2007/06/16 20:04:28 dsl Exp $ */ +/* $NetBSD: netbsd32_compat_13.c,v 1.23 2007/12/08 18:36:17 dsl Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_13.c,v 1.22 2007/06/16 20:04:28 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_13.c,v 1.23 2007/12/08 18:36:17 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -49,10 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_13.c,v 1.22 2007/06/16 20:04:28 dsl #include <compat/common/compat_sigaltstack.h> int -compat_13_netbsd32_sigaltstack13(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_13_netbsd32_sigaltstack13(struct lwp *l, void *v, register_t *retval) { struct compat_13_netbsd32_sigaltstack13_args *uap = v; compat_sigaltstack(uap, netbsd32_sigaltstack13, SS_ONSTACK, SS_DISABLE); @@ -60,10 +57,7 @@ compat_13_netbsd32_sigaltstack13(l, v, retval) int -compat_13_netbsd32_sigprocmask(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_13_netbsd32_sigprocmask(struct lwp *l, void *v, register_t *retval) { struct compat_13_netbsd32_sigprocmask_args /* { syscallarg(int) how; @@ -84,10 +78,7 @@ compat_13_netbsd32_sigprocmask(l, v, retval) } int -compat_13_netbsd32_sigsuspend(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_13_netbsd32_sigsuspend(struct lwp *l, void *v, register_t *retval) { struct compat_13_netbsd32_sigsuspend_args /* { syscallarg(sigset13_t) mask; diff --git a/sys/compat/netbsd32/netbsd32_compat_14.c b/sys/compat/netbsd32/netbsd32_compat_14.c index 68f6cb8c32d..9d2dc6507cb 100644 --- a/sys/compat/netbsd32/netbsd32_compat_14.c +++ b/sys/compat/netbsd32/netbsd32_compat_14.c @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_14.c,v 1.19 2007/03/20 08:25:37 cube Exp $ */ +/* $NetBSD: netbsd32_compat_14.c,v 1.20 2007/12/08 18:36:17 dsl Exp $ */ /* * Copyright (c) 1999 Eduardo E. Horvath @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_14.c,v 1.19 2007/03/20 08:25:37 cube Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_14.c,v 1.20 2007/12/08 18:36:17 dsl Exp $"); #include <sys/param.h> #include <sys/ipc.h> @@ -74,9 +74,7 @@ static inline void native_to_netbsd32_shmid_ds14(struct shmid_ds *, struct netbsd32_shmid_ds14 *); static inline void -netbsd32_ipc_perm14_to_native(operm, perm) - struct netbsd32_ipc_perm14 *operm; - struct ipc_perm *perm; +netbsd32_ipc_perm14_to_native(struct netbsd32_ipc_perm14 *operm, struct ipc_perm *perm) { #define CVT(x) perm->x = operm->x @@ -89,9 +87,7 @@ netbsd32_ipc_perm14_to_native(operm, perm) } static inline void -native_to_netbsd32_ipc_perm14(perm, operm) - struct ipc_perm *perm; - struct netbsd32_ipc_perm14 *operm; +native_to_netbsd32_ipc_perm14(struct ipc_perm *perm, struct netbsd32_ipc_perm14 *operm) { #define CVT(x) operm->x = perm->x @@ -110,9 +106,7 @@ native_to_netbsd32_ipc_perm14(perm, operm) } static inline void -netbsd32_msqid_ds14_to_native(omsqbuf, msqbuf) - struct netbsd32_msqid_ds14 *omsqbuf; - struct msqid_ds *msqbuf; +netbsd32_msqid_ds14_to_native(struct netbsd32_msqid_ds14 *omsqbuf, struct msqid_ds *msqbuf) { netbsd32_ipc_perm14_to_native(&omsqbuf->msg_perm, &msqbuf->msg_perm); @@ -129,9 +123,7 @@ netbsd32_msqid_ds14_to_native(omsqbuf, msqbuf) } static inline void -native_to_netbsd32_msqid_ds14(msqbuf, omsqbuf) - struct msqid_ds *msqbuf; - struct netbsd32_msqid_ds14 *omsqbuf; +native_to_netbsd32_msqid_ds14(struct msqid_ds *msqbuf, struct netbsd32_msqid_ds14 *omsqbuf) { native_to_netbsd32_ipc_perm14(&msqbuf->msg_perm, &omsqbuf->msg_perm); @@ -153,9 +145,7 @@ native_to_netbsd32_msqid_ds14(msqbuf, omsqbuf) } static inline void -netbsd32_semid_ds14_to_native(osembuf, sembuf) - struct netbsd32_semid_ds14 *osembuf; - struct semid_ds *sembuf; +netbsd32_semid_ds14_to_native(struct netbsd32_semid_ds14 *osembuf, struct semid_ds *sembuf) { netbsd32_ipc_perm14_to_native(&osembuf->sem_perm, &sembuf->sem_perm); @@ -168,9 +158,7 @@ netbsd32_semid_ds14_to_native(osembuf, sembuf) } static inline void -native_to_netbsd32_semid_ds14(sembuf, osembuf) - struct semid_ds *sembuf; - struct netbsd32_semid_ds14 *osembuf; +native_to_netbsd32_semid_ds14(struct semid_ds *sembuf, struct netbsd32_semid_ds14 *osembuf) { native_to_netbsd32_ipc_perm14(&sembuf->sem_perm, &osembuf->sem_perm); @@ -183,9 +171,7 @@ native_to_netbsd32_semid_ds14(sembuf, osembuf) } static inline void -netbsd32_shmid_ds14_to_native(oshmbuf, shmbuf) - struct netbsd32_shmid_ds14 *oshmbuf; - struct shmid_ds *shmbuf; +netbsd32_shmid_ds14_to_native(struct netbsd32_shmid_ds14 *oshmbuf, struct shmid_ds *shmbuf) { netbsd32_ipc_perm14_to_native(&oshmbuf->shm_perm, &shmbuf->shm_perm); @@ -202,9 +188,7 @@ netbsd32_shmid_ds14_to_native(oshmbuf, shmbuf) } static inline void -native_to_netbsd32_shmid_ds14(shmbuf, oshmbuf) - struct shmid_ds *shmbuf; - struct netbsd32_shmid_ds14 *oshmbuf; +native_to_netbsd32_shmid_ds14(struct shmid_ds *shmbuf, struct netbsd32_shmid_ds14 *oshmbuf) { native_to_netbsd32_ipc_perm14(&shmbuf->shm_perm, &oshmbuf->shm_perm); @@ -224,10 +208,7 @@ native_to_netbsd32_shmid_ds14(shmbuf, oshmbuf) * the compat_14 system calls */ int -compat_14_netbsd32_msgctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_14_netbsd32_msgctl(struct lwp *l, void *v, register_t *retval) { struct compat_14_netbsd32_msgctl_args /* { syscallarg(int) msqid; @@ -261,10 +242,7 @@ compat_14_netbsd32_msgctl(l, v, retval) } int -compat_14_netbsd32___semctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_14_netbsd32___semctl(struct lwp *l, void *v, register_t *retval) { struct compat_14_netbsd32___semctl_args /* { syscallarg(int) semid; @@ -318,10 +296,7 @@ compat_14_netbsd32___semctl(l, v, retval) } int -compat_14_netbsd32_shmctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_14_netbsd32_shmctl(struct lwp *l, void *v, register_t *retval) { struct compat_14_netbsd32_shmctl_args /* { syscallarg(int) shmid; diff --git a/sys/compat/netbsd32/netbsd32_compat_20.c b/sys/compat/netbsd32/netbsd32_compat_20.c index 612989467b6..b6e8b960867 100644 --- a/sys/compat/netbsd32/netbsd32_compat_20.c +++ b/sys/compat/netbsd32/netbsd32_compat_20.c @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_20.c,v 1.16 2007/11/27 09:47:15 dogcow Exp $ */ +/* $NetBSD: netbsd32_compat_20.c,v 1.17 2007/12/08 18:36:17 dsl Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.16 2007/11/27 09:47:15 dogcow Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_20.c,v 1.17 2007/12/08 18:36:17 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -54,9 +54,7 @@ static inline void compat_20_netbsd32_from_statvfs(struct statvfs *, struct netbsd32_statfs *); static inline void -compat_20_netbsd32_from_statvfs(sbp, sb32p) - struct statvfs *sbp; - struct netbsd32_statfs *sb32p; +compat_20_netbsd32_from_statvfs(struct statvfs *sbp, struct netbsd32_statfs *sb32p) { sb32p->f_flags = sbp->f_flag; sb32p->f_bsize = (netbsd32_long)sbp->f_bsize; @@ -90,10 +88,7 @@ compat_20_netbsd32_from_statvfs(sbp, sb32p) } int -compat_20_netbsd32_getfsstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_20_netbsd32_getfsstat(struct lwp *l, void *v, register_t *retval) { struct compat_20_netbsd32_getfsstat_args /* { syscallarg(netbsd32_statfsp_t) buf; @@ -155,10 +150,7 @@ compat_20_netbsd32_getfsstat(l, v, retval) } int -compat_20_netbsd32_statfs(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_20_netbsd32_statfs(struct lwp *l, void *v, register_t *retval) { struct compat_20_netbsd32_statfs_args /* { syscallarg(const netbsd32_charp) path; @@ -184,10 +176,7 @@ compat_20_netbsd32_statfs(l, v, retval) } int -compat_20_netbsd32_fstatfs(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_20_netbsd32_fstatfs(struct lwp *l, void *v, register_t *retval) { struct compat_20_netbsd32_fstatfs_args /* { syscallarg(int) fd; @@ -216,10 +205,7 @@ compat_20_netbsd32_fstatfs(l, v, retval) } int -compat_20_netbsd32_fhstatfs(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_20_netbsd32_fhstatfs(struct lwp *l, void *v, register_t *retval) { struct compat_20_netbsd32_fhstatfs_args /* { syscallarg(const netbsd32_fhandlep_t) fhp; diff --git a/sys/compat/netbsd32/netbsd32_compat_30.c b/sys/compat/netbsd32/netbsd32_compat_30.c index 86e31e813bd..a88a9d08edf 100644 --- a/sys/compat/netbsd32/netbsd32_compat_30.c +++ b/sys/compat/netbsd32/netbsd32_compat_30.c @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_30.c,v 1.21 2007/04/30 08:32:15 dsl Exp $ */ +/* $NetBSD: netbsd32_compat_30.c,v 1.22 2007/12/08 18:36:18 dsl Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.21 2007/04/30 08:32:15 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.22 2007/12/08 18:36:18 dsl Exp $"); #include "opt_nfsserver.h" @@ -61,10 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.21 2007/04/30 08:32:15 dsl int -compat_30_netbsd32_getdents(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_30_netbsd32_getdents(struct lwp *l, void *v, register_t *retval) { struct compat_30_netbsd32_getdents_args /* { syscallarg(int) fd; @@ -100,10 +97,7 @@ compat_30_netbsd32_getdents(l, v, retval) } int -compat_30_netbsd32___stat13(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_30_netbsd32___stat13(struct lwp *l, void *v, register_t *retval) { struct compat_30_netbsd32___stat13_args /* { syscallarg(const netbsd32_charp) path; @@ -125,10 +119,7 @@ compat_30_netbsd32___stat13(l, v, retval) } int -compat_30_netbsd32___fstat13(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_30_netbsd32___fstat13(struct lwp *l, void *v, register_t *retval) { struct compat_30_netbsd32___fstat13_args /* { syscallarg(int) fd; @@ -157,10 +148,7 @@ compat_30_netbsd32___fstat13(l, v, retval) } int -compat_30_netbsd32___lstat13(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_30_netbsd32___lstat13(struct lwp *l, void *v, register_t *retval) { struct compat_30_netbsd32___lstat13_args /* { syscallarg(const netbsd32_charp) path; @@ -182,10 +170,7 @@ compat_30_netbsd32___lstat13(l, v, retval) } int -compat_30_netbsd32_fhstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_30_netbsd32_fhstat(struct lwp *l, void *v, register_t *retval) { struct compat_30_netbsd32_fhstat_args /* { syscallarg(const netbsd32_fhandlep_t) fhp; @@ -224,10 +209,7 @@ compat_30_netbsd32_fhstat(l, v, retval) } int -compat_30_netbsd32_fhstatvfs1(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_30_netbsd32_fhstatvfs1(struct lwp *l, void *v, register_t *retval) { struct compat_30_netbsd32_fhstatvfs1_args /* { syscallarg(const netbsd32_fhandlep_t) fhp; @@ -254,10 +236,7 @@ compat_30_netbsd32_fhstatvfs1(l, v, retval) } int -compat_30_netbsd32_socket(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_30_netbsd32_socket(struct lwp *l, void *v, register_t *retval) { struct compat_30_netbsd32_socket_args /* { syscallarg(int) domain; @@ -273,10 +252,7 @@ compat_30_netbsd32_socket(l, v, retval) } int -compat_30_netbsd32_getfh(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_30_netbsd32_getfh(struct lwp *l, void *v, register_t *retval) { struct compat_30_netbsd32_getfh_args /* { syscallarg(const netbsd32_charp) fname; @@ -320,10 +296,7 @@ int compat_30_netbsd32_sys___fhstat30(l, v, retval) * and call the device open routine if any. */ int -compat_30_netbsd32_fhopen(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_30_netbsd32_fhopen(struct lwp *l, void *v, register_t *retval) { struct compat_30_netbsd32_fhopen_args /* { syscallarg(const fhandle_t *) fhp; diff --git a/sys/compat/netbsd32/netbsd32_compat_43.c b/sys/compat/netbsd32/netbsd32_compat_43.c index 04acc22486e..2b53eca2044 100644 --- a/sys/compat/netbsd32/netbsd32_compat_43.c +++ b/sys/compat/netbsd32/netbsd32_compat_43.c @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_43.c,v 1.45 2007/12/04 18:40:19 dsl Exp $ */ +/* $NetBSD: netbsd32_compat_43.c,v 1.46 2007/12/08 18:36:18 dsl Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_43.c,v 1.45 2007/12/04 18:40:19 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_43.c,v 1.46 2007/12/08 18:36:18 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_43.h" @@ -96,10 +96,7 @@ netbsd32_from_stat(const struct stat *sb, struct netbsd32_stat43 *sp32) /* file system syscalls */ int -compat_43_netbsd32_ocreat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_43_netbsd32_ocreat(struct lwp *l, void *v, register_t *retval) { struct compat_43_netbsd32_ocreat_args /* { syscallarg(const netbsd32_charp) path; @@ -115,10 +112,7 @@ compat_43_netbsd32_ocreat(l, v, retval) } int -compat_43_netbsd32_olseek(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_43_netbsd32_olseek(struct lwp *l, void *v, register_t *retval) { struct compat_43_netbsd32_olseek_args /* { syscallarg(int) fd; @@ -139,10 +133,7 @@ compat_43_netbsd32_olseek(l, v, retval) } int -compat_43_netbsd32_stat43(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_43_netbsd32_stat43(struct lwp *l, void *v, register_t *retval) { struct compat_43_netbsd32_stat43_args /* { syscallarg(const netbsd32_charp) path; @@ -161,10 +152,7 @@ compat_43_netbsd32_stat43(l, v, retval) } int -compat_43_netbsd32_lstat43(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_43_netbsd32_lstat43(struct lwp *l, void *v, register_t *retval) { struct compat_43_netbsd32_lstat43_args /* { syscallarg(const netbsd32_charp) path; @@ -183,10 +171,7 @@ compat_43_netbsd32_lstat43(l, v, retval) } int -compat_43_netbsd32_fstat43(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_43_netbsd32_fstat43(struct lwp *l, void *v, register_t *retval) { struct compat_43_netbsd32_fstat43_args /* { syscallarg(int) fd; @@ -205,10 +190,7 @@ compat_43_netbsd32_fstat43(l, v, retval) } int -compat_43_netbsd32_otruncate(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_43_netbsd32_otruncate(struct lwp *l, void *v, register_t *retval) { struct compat_43_netbsd32_otruncate_args /* { syscallarg(const netbsd32_charp) path; @@ -222,10 +204,7 @@ compat_43_netbsd32_otruncate(l, v, retval) } int -compat_43_netbsd32_oftruncate(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_43_netbsd32_oftruncate(struct lwp *l, void *v, register_t *retval) { struct compat_43_netbsd32_oftruncate_args /* { syscallarg(int) fd; @@ -239,10 +218,7 @@ compat_43_netbsd32_oftruncate(l, v, retval) } int -compat_43_netbsd32_ogetdirentries(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_43_netbsd32_ogetdirentries(struct lwp *l, void *v, register_t *retval) { struct compat_43_netbsd32_ogetdirentries_args /* { syscallarg(int) fd; @@ -261,10 +237,7 @@ compat_43_netbsd32_ogetdirentries(l, v, retval) /* kernel syscalls */ int -compat_43_netbsd32_ogetkerninfo(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_43_netbsd32_ogetkerninfo(struct lwp *l, void *v, register_t *retval) { struct compat_43_netbsd32_ogetkerninfo_args /* { syscallarg(int) op; @@ -282,10 +255,7 @@ compat_43_netbsd32_ogetkerninfo(l, v, retval) } int -compat_43_netbsd32_ogethostname(l, v, retval) - struct lwp* l; - void *v; - register_t *retval; +compat_43_netbsd32_ogethostname(struct lwp* l, void *v, register_t *retval) { struct compat_43_netbsd32_ogethostname_args /* { syscallarg(netbsd32_charp) hostname; @@ -302,10 +272,7 @@ compat_43_netbsd32_ogethostname(l, v, retval) } int -compat_43_netbsd32_osethostname(l, v, retval) - struct lwp* l; - void *v; - register_t *retval; +compat_43_netbsd32_osethostname(struct lwp* l, void *v, register_t *retval) { struct compat_43_netbsd32_osethostname_args /* { syscallarg(netbsd32_charp) hostname; @@ -320,10 +287,7 @@ compat_43_netbsd32_osethostname(l, v, retval) } int -compat_43_netbsd32_sethostid(l, v, retval) - struct lwp* l; - void *v; - register_t *retval; +compat_43_netbsd32_sethostid(struct lwp* l, void *v, register_t *retval) { struct compat_43_netbsd32_sethostid_args /* { syscallarg(int32_t) hostid; @@ -335,10 +299,7 @@ compat_43_netbsd32_sethostid(l, v, retval) } int -compat_43_netbsd32_ogetrlimit(l, v, retval) - struct lwp* l; - void *v; - register_t *retval; +compat_43_netbsd32_ogetrlimit(struct lwp* l, void *v, register_t *retval) { struct compat_43_netbsd32_ogetrlimit_args /* { syscallarg(int) which; @@ -352,10 +313,7 @@ compat_43_netbsd32_ogetrlimit(l, v, retval) } int -compat_43_netbsd32_osetrlimit(l, v, retval) - struct lwp* l; - void *v; - register_t *retval; +compat_43_netbsd32_osetrlimit(struct lwp* l, void *v, register_t *retval) { struct compat_43_netbsd32_osetrlimit_args /* { syscallarg(int) which; @@ -369,10 +327,7 @@ compat_43_netbsd32_osetrlimit(l, v, retval) } int -compat_43_netbsd32_killpg(l, v, retval) - struct lwp* l; - void *v; - register_t *retval; +compat_43_netbsd32_killpg(struct lwp* l, void *v, register_t *retval) { struct compat_43_netbsd32_killpg_args /* { syscallarg(int) pgid; @@ -387,10 +342,7 @@ compat_43_netbsd32_killpg(l, v, retval) /* virtual memory syscalls */ int -compat_43_netbsd32_ommap(l, v, retval) - struct lwp* l; - void *v; - register_t *retval; +compat_43_netbsd32_ommap(struct lwp* l, void *v, register_t *retval) { struct compat_43_netbsd32_ommap_args /* { syscallarg(netbsd32_caddr_t) addr; @@ -413,10 +365,7 @@ compat_43_netbsd32_ommap(l, v, retval) /* network syscalls */ int -compat_43_netbsd32_oaccept(l, v, retval) - struct lwp* l; - void *v; - register_t *retval; +compat_43_netbsd32_oaccept(struct lwp* l, void *v, register_t *retval) { struct compat_43_netbsd32_oaccept_args /* { syscallarg(int) s; @@ -432,10 +381,7 @@ compat_43_netbsd32_oaccept(l, v, retval) } int -compat_43_netbsd32_osend(l, v, retval) - struct lwp* l; - void *v; - register_t *retval; +compat_43_netbsd32_osend(struct lwp* l, void *v, register_t *retval) { struct compat_43_netbsd32_osend_args /* { syscallarg(int) s; @@ -453,10 +399,7 @@ compat_43_netbsd32_osend(l, v, retval) } int -compat_43_netbsd32_orecv(l, v, retval) - struct lwp* l; - void *v; - register_t *retval; +compat_43_netbsd32_orecv(struct lwp* l, void *v, register_t *retval) { struct compat_43_netbsd32_orecv_args /* { syscallarg(int) s; @@ -477,10 +420,7 @@ compat_43_netbsd32_orecv(l, v, retval) * This is a brutal clone of compat_43_sys_recvmsg(). */ int -compat_43_netbsd32_orecvmsg(l, v, retval) - struct lwp* l; - void *v; - register_t *retval; +compat_43_netbsd32_orecvmsg(struct lwp* l, void *v, register_t *retval) { struct compat_43_netbsd32_orecvmsg_args /* { syscallarg(int) s; @@ -560,10 +500,7 @@ compat_43_netbsd32_orecvmsg(l, v, retval) } int -compat_43_netbsd32_osendmsg(l, v, retval) - struct lwp* l; - void *v; - register_t *retval; +compat_43_netbsd32_osendmsg(struct lwp* l, void *v, register_t *retval) { struct compat_43_netbsd32_osendmsg_args /* { syscallarg(int) s; @@ -619,10 +556,7 @@ compat_43_netbsd32_osendmsg(l, v, retval) } int -compat_43_netbsd32_orecvfrom(l, v, retval) - struct lwp* l; - void *v; - register_t *retval; +compat_43_netbsd32_orecvfrom(struct lwp* l, void *v, register_t *retval) { struct compat_43_netbsd32_orecvfrom_args /* { syscallarg(int) s; @@ -644,10 +578,7 @@ compat_43_netbsd32_orecvfrom(l, v, retval) } int -compat_43_netbsd32_ogetsockname(l, v, retval) - struct lwp* l; - void *v; - register_t *retval; +compat_43_netbsd32_ogetsockname(struct lwp* l, void *v, register_t *retval) { struct compat_43_netbsd32_ogetsockname_args /* { syscallarg(int) fdec; @@ -663,10 +594,7 @@ compat_43_netbsd32_ogetsockname(l, v, retval) } int -compat_43_netbsd32_ogetpeername(l, v, retval) - struct lwp* l; - void *v; - register_t *retval; +compat_43_netbsd32_ogetpeername(struct lwp* l, void *v, register_t *retval) { struct compat_43_netbsd32_ogetpeername_args /* { syscallarg(int) fdes; @@ -683,10 +611,7 @@ compat_43_netbsd32_ogetpeername(l, v, retval) /* signal syscalls */ int -compat_43_netbsd32_osigvec(l, v, retval) - struct lwp* l; - void *v; - register_t *retval; +compat_43_netbsd32_osigvec(struct lwp* l, void *v, register_t *retval) { struct compat_43_netbsd32_osigvec_args /* { syscallarg(int) signum; @@ -727,10 +652,7 @@ compat_43_netbsd32_osigvec(l, v, retval) } int -compat_43_netbsd32_sigblock(l, v, retval) - struct lwp* l; - void *v; - register_t *retval; +compat_43_netbsd32_sigblock(struct lwp* l, void *v, register_t *retval) { struct compat_43_netbsd32_sigblock_args /* { syscallarg(int) mask; @@ -742,10 +664,7 @@ compat_43_netbsd32_sigblock(l, v, retval) } int -compat_43_netbsd32_sigsetmask(l, v, retval) - struct lwp* l; - void *v; - register_t *retval; +compat_43_netbsd32_sigsetmask(struct lwp* l, void *v, register_t *retval) { struct compat_43_netbsd32_sigsetmask_args /* { syscallarg(int) mask; @@ -757,10 +676,7 @@ compat_43_netbsd32_sigsetmask(l, v, retval) } int -compat_43_netbsd32_osigstack(l, v, retval) - struct lwp* l; - void *v; - register_t *retval; +compat_43_netbsd32_osigstack(struct lwp* l, void *v, register_t *retval) { struct compat_43_netbsd32_osigstack_args /* { syscallarg(netbsd32_sigstackp_t) nss; diff --git a/sys/compat/netbsd32/netbsd32_exec_aout.c b/sys/compat/netbsd32/netbsd32_exec_aout.c index 1fcbe204bbf..3ae093564fe 100644 --- a/sys/compat/netbsd32/netbsd32_exec_aout.c +++ b/sys/compat/netbsd32/netbsd32_exec_aout.c @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_exec_aout.c,v 1.22 2007/12/04 18:40:19 dsl Exp $ */ +/* $NetBSD: netbsd32_exec_aout.c,v 1.23 2007/12/08 18:36:18 dsl Exp $ */ /* from: NetBSD: exec_aout.c,v 1.15 1996/09/26 23:34:46 cgd Exp */ /* @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_exec_aout.c,v 1.22 2007/12/04 18:40:19 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_exec_aout.c,v 1.23 2007/12/08 18:36:18 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -98,9 +98,7 @@ int netbsd32_copyinargs(struct exec_package *, struct ps_strings *, */ int -exec_netbsd32_makecmds(l, epp) - struct lwp *l; - struct exec_package *epp; +exec_netbsd32_makecmds(struct lwp *l, struct exec_package *epp) { netbsd32_u_long midmag, magic; u_short mid; @@ -154,9 +152,7 @@ exec_netbsd32_makecmds(l, epp) */ int -netbsd32_exec_aout_prep_zmagic(l, epp) - struct lwp *l; - struct exec_package *epp; +netbsd32_exec_aout_prep_zmagic(struct lwp *l, struct exec_package *epp) { struct netbsd32_exec *execp = epp->ep_hdr; int error; @@ -197,9 +193,7 @@ netbsd32_exec_aout_prep_zmagic(l, epp) */ int -netbsd32_exec_aout_prep_nmagic(l, epp) - struct lwp *l; - struct exec_package *epp; +netbsd32_exec_aout_prep_nmagic(struct lwp *l, struct exec_package *epp) { struct netbsd32_exec *execp = epp->ep_hdr; long bsize, baddr; @@ -238,9 +232,7 @@ netbsd32_exec_aout_prep_nmagic(l, epp) */ int -netbsd32_exec_aout_prep_omagic(l, epp) - struct lwp *l; - struct exec_package *epp; +netbsd32_exec_aout_prep_omagic(struct lwp *l, struct exec_package *epp) { struct netbsd32_exec *execp = epp->ep_hdr; long dsize, bsize, baddr; diff --git a/sys/compat/netbsd32/netbsd32_fs.c b/sys/compat/netbsd32/netbsd32_fs.c index 4d85d6e7c69..90dc0b322f9 100644 --- a/sys/compat/netbsd32/netbsd32_fs.c +++ b/sys/compat/netbsd32/netbsd32_fs.c @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_fs.c,v 1.47 2007/12/04 18:40:20 dsl Exp $ */ +/* $NetBSD: netbsd32_fs.c,v 1.48 2007/12/08 18:36:18 dsl Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_fs.c,v 1.47 2007/12/04 18:40:20 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_fs.c,v 1.48 2007/12/08 18:36:18 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -101,10 +101,7 @@ netbsd32_get_iov(struct netbsd32_iovec *iov32, int iovlen, struct iovec *aiov, } int -netbsd32_readv(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_readv(struct lwp *l, void *v, register_t *retval) { struct netbsd32_readv_args /* { syscallarg(int) fd; @@ -131,15 +128,7 @@ netbsd32_readv(l, v, retval) /* Damn thing copies in the iovec! */ int -dofilereadv32(l, fd, fp, iovp, iovcnt, offset, flags, retval) - struct lwp *l; - int fd; - struct file *fp; - struct netbsd32_iovec *iovp; - int iovcnt; - off_t *offset; - int flags; - register_t *retval; +dofilereadv32(struct lwp *l, int fd, struct file *fp, struct netbsd32_iovec *iovp, int iovcnt, off_t *offset, int flags, register_t *retval) { struct uio auio; struct iovec *iov; @@ -219,10 +208,7 @@ out: } int -netbsd32_writev(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_writev(struct lwp *l, void *v, register_t *retval) { struct netbsd32_writev_args /* { syscallarg(int) fd; @@ -248,15 +234,7 @@ netbsd32_writev(l, v, retval) } int -dofilewritev32(l, fd, fp, iovp, iovcnt, offset, flags, retval) - struct lwp *l; - int fd; - struct file *fp; - struct netbsd32_iovec *iovp; - int iovcnt; - off_t *offset; - int flags; - register_t *retval; +dofilewritev32(struct lwp *l, int fd, struct file *fp, struct netbsd32_iovec *iovp, int iovcnt, off_t *offset, int flags, register_t *retval) { struct uio auio; struct iovec *iov; @@ -366,10 +344,7 @@ get_utimes32(const netbsd32_timevalp_t *tptr, struct timeval *tv, } int -netbsd32_utimes(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_utimes(struct lwp *l, void *v, register_t *retval) { struct netbsd32_utimes_args /* { syscallarg(const netbsd32_charp) path; @@ -401,10 +376,7 @@ netbds32_copyout_statvfs(const void *kp, void *up, size_t len) } int -netbsd32_statvfs1(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_statvfs1(struct lwp *l, void *v, register_t *retval) { struct netbsd32_statvfs1_args /* { syscallarg(const netbsd32_charp) path; @@ -423,10 +395,7 @@ netbsd32_statvfs1(l, v, retval) } int -netbsd32_fstatvfs1(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_fstatvfs1(struct lwp *l, void *v, register_t *retval) { struct netbsd32_fstatvfs1_args /* { syscallarg(int) fd; @@ -445,10 +414,7 @@ netbsd32_fstatvfs1(l, v, retval) } int -netbsd32_getvfsstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_getvfsstat(struct lwp *l, void *v, register_t *retval) { struct netbsd32_getvfsstat_args /* { syscallarg(netbsd32_statvfsp_t) buf; @@ -462,10 +428,7 @@ netbsd32_getvfsstat(l, v, retval) } int -netbsd32___fhstatvfs140(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32___fhstatvfs140(struct lwp *l, void *v, register_t *retval) { struct netbsd32___fhstatvfs140_args /* { syscallarg(const netbsd32_pointer_t) fhp; @@ -488,10 +451,7 @@ netbsd32___fhstatvfs140(l, v, retval) } int -netbsd32_futimes(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_futimes(struct lwp *l, void *v, register_t *retval) { struct netbsd32_futimes_args /* { syscallarg(int) fd; @@ -516,10 +476,7 @@ netbsd32_futimes(l, v, retval) } int -netbsd32_sys___getdents30(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_sys___getdents30(struct lwp *l, void *v, register_t *retval) { struct netbsd32_sys___getdents30_args /* { syscallarg(int) fd; @@ -546,10 +503,7 @@ netbsd32_sys___getdents30(l, v, retval) } int -netbsd32_lutimes(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_lutimes(struct lwp *l, void *v, register_t *retval) { struct netbsd32_lutimes_args /* { syscallarg(const netbsd32_charp) path; @@ -567,10 +521,7 @@ netbsd32_lutimes(l, v, retval) } int -netbsd32_sys___stat30(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_sys___stat30(struct lwp *l, void *v, register_t *retval) { struct netbsd32_sys___stat30_args /* { syscallarg(const netbsd32_charp) path; @@ -592,10 +543,7 @@ netbsd32_sys___stat30(l, v, retval) } int -netbsd32_sys___fstat30(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_sys___fstat30(struct lwp *l, void *v, register_t *retval) { struct netbsd32_sys___fstat30_args /* { syscallarg(int) fd; @@ -624,10 +572,7 @@ netbsd32_sys___fstat30(l, v, retval) } int -netbsd32_sys___lstat30(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_sys___lstat30(struct lwp *l, void *v, register_t *retval) { struct netbsd32_sys___lstat30_args /* { syscallarg(const netbsd32_charp) path; @@ -671,10 +616,7 @@ int netbsd32___fhstat40(l, v, retval) } int -netbsd32_preadv(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_preadv(struct lwp *l, void *v, register_t *retval) { struct netbsd32_preadv_args /* { syscallarg(int) fd; @@ -722,10 +664,7 @@ out: } int -netbsd32_pwritev(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_pwritev(struct lwp *l, void *v, register_t *retval) { struct netbsd32_pwritev_args /* { syscallarg(int) fd; diff --git a/sys/compat/netbsd32/netbsd32_ioctl.c b/sys/compat/netbsd32/netbsd32_ioctl.c index 49bf2c081f8..9da98ac5f0c 100644 --- a/sys/compat/netbsd32/netbsd32_ioctl.c +++ b/sys/compat/netbsd32/netbsd32_ioctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_ioctl.c,v 1.35 2007/08/15 12:07:31 ad Exp $ */ +/* $NetBSD: netbsd32_ioctl.c,v 1.36 2007/12/08 18:36:18 dsl Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.35 2007/08/15 12:07:31 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.36 2007/12/08 18:36:18 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -118,10 +118,7 @@ static inline void netbsd32_from_sioc_sg_req(struct sioc_sg_req *, /* convert to/from different structures */ static inline void -netbsd32_to_partinfo(s32p, p, cmd) - struct netbsd32_partinfo *s32p; - struct partinfo *p; - u_long cmd; +netbsd32_to_partinfo(struct netbsd32_partinfo *s32p, struct partinfo *p, u_long cmd) { p->disklab = (struct disklabel *)NETBSD32PTR64(s32p->disklab); @@ -130,10 +127,7 @@ netbsd32_to_partinfo(s32p, p, cmd) #if 0 static inline void -netbsd32_to_format_op(s32p, p, cmd) - struct netbsd32_format_op *s32p; - struct format_op *p; - u_long cmd; +netbsd32_to_format_op(struct netbsd32_format_op *s32p, struct format_op *p, u_long cmd) { p->df_buf = (char *)NETBSD32PTR64(s32p->df_buf); @@ -144,10 +138,7 @@ netbsd32_to_format_op(s32p, p, cmd) #endif static inline void -netbsd32_to_ifreq(s32p, p, cmd) - struct netbsd32_ifreq *s32p; - struct ifreq *p; - u_long cmd; +netbsd32_to_ifreq(struct netbsd32_ifreq *s32p, struct ifreq *p, u_long cmd) { memcpy(p, s32p, sizeof *s32p); @@ -162,10 +153,7 @@ netbsd32_to_ifreq(s32p, p, cmd) } static inline void -netbsd32_to_ifconf(s32p, p, cmd) - struct netbsd32_ifconf *s32p; - struct ifconf *p; - u_long cmd; +netbsd32_to_ifconf(struct netbsd32_ifconf *s32p, struct ifconf *p, u_long cmd) { p->ifc_len = s32p->ifc_len; @@ -174,10 +162,7 @@ netbsd32_to_ifconf(s32p, p, cmd) } static inline void -netbsd32_to_ifmediareq(s32p, p, cmd) - struct netbsd32_ifmediareq *s32p; - struct ifmediareq *p; - u_long cmd; +netbsd32_to_ifmediareq(struct netbsd32_ifmediareq *s32p, struct ifmediareq *p, u_long cmd) { memcpy(p, s32p, sizeof *s32p); @@ -185,10 +170,7 @@ netbsd32_to_ifmediareq(s32p, p, cmd) } static inline void -netbsd32_to_ifdrv(s32p, p, cmd) - struct netbsd32_ifdrv *s32p; - struct ifdrv *p; - u_long cmd; +netbsd32_to_ifdrv(struct netbsd32_ifdrv *s32p, struct ifdrv *p, u_long cmd) { memcpy(p, s32p, sizeof *s32p); @@ -196,10 +178,7 @@ netbsd32_to_ifdrv(s32p, p, cmd) } static inline void -netbsd32_to_sioc_vif_req(s32p, p, cmd) - struct netbsd32_sioc_vif_req *s32p; - struct sioc_vif_req *p; - u_long cmd; +netbsd32_to_sioc_vif_req(struct netbsd32_sioc_vif_req *s32p, struct sioc_vif_req *p, u_long cmd) { p->vifi = s32p->vifi; @@ -210,10 +189,7 @@ netbsd32_to_sioc_vif_req(s32p, p, cmd) } static inline void -netbsd32_to_sioc_sg_req(s32p, p, cmd) - struct netbsd32_sioc_sg_req *s32p; - struct sioc_sg_req *p; - u_long cmd; +netbsd32_to_sioc_sg_req(struct netbsd32_sioc_sg_req *s32p, struct sioc_sg_req *p, u_long cmd) { p->src = s32p->src; @@ -228,10 +204,7 @@ netbsd32_to_sioc_sg_req(s32p, p, cmd) */ static inline void -netbsd32_from_partinfo(p, s32p, cmd) - struct partinfo *p; - struct netbsd32_partinfo *s32p; - u_long cmd; +netbsd32_from_partinfo(struct partinfo *p, struct netbsd32_partinfo *s32p, u_long cmd) { NETBSD32PTR32(s32p->disklab, p->disklab); @@ -240,10 +213,7 @@ netbsd32_from_partinfo(p, s32p, cmd) #if 0 static inline void -netbsd32_from_format_op(p, s32p, cmd) - struct format_op *p; - struct netbsd32_format_op *s32p; - u_long cmd; +netbsd32_from_format_op(struct format_op *p, struct netbsd32_format_op *s32p, u_long cmd) { /* filled in */ @@ -257,10 +227,7 @@ netbsd32_from_format_op(p, s32p, cmd) #endif static inline void -netbsd32_from_ifreq(p, s32p, cmd) - struct ifreq *p; - struct netbsd32_ifreq *s32p; - u_long cmd; +netbsd32_from_ifreq(struct ifreq *p, struct netbsd32_ifreq *s32p, u_long cmd) { /* @@ -275,10 +242,7 @@ netbsd32_from_ifreq(p, s32p, cmd) } static inline void -netbsd32_from_ifconf(p, s32p, cmd) - struct ifconf *p; - struct netbsd32_ifconf *s32p; - u_long cmd; +netbsd32_from_ifconf(struct ifconf *p, struct netbsd32_ifconf *s32p, u_long cmd) { s32p->ifc_len = p->ifc_len; @@ -287,10 +251,7 @@ netbsd32_from_ifconf(p, s32p, cmd) } static inline void -netbsd32_from_ifmediareq(p, s32p, cmd) - struct ifmediareq *p; - struct netbsd32_ifmediareq *s32p; - u_long cmd; +netbsd32_from_ifmediareq(struct ifmediareq *p, struct netbsd32_ifmediareq *s32p, u_long cmd) { memcpy(s32p, p, sizeof *p); @@ -301,10 +262,7 @@ netbsd32_from_ifmediareq(p, s32p, cmd) } static inline void -netbsd32_from_ifdrv(p, s32p, cmd) - struct ifdrv *p; - struct netbsd32_ifdrv *s32p; - u_long cmd; +netbsd32_from_ifdrv(struct ifdrv *p, struct netbsd32_ifdrv *s32p, u_long cmd) { memcpy(s32p, p, sizeof *p); @@ -315,10 +273,7 @@ netbsd32_from_ifdrv(p, s32p, cmd) } static inline void -netbsd32_from_sioc_vif_req(p, s32p, cmd) - struct sioc_vif_req *p; - struct netbsd32_sioc_vif_req *s32p; - u_long cmd; +netbsd32_from_sioc_vif_req(struct sioc_vif_req *p, struct netbsd32_sioc_vif_req *s32p, u_long cmd) { s32p->vifi = p->vifi; @@ -329,10 +284,7 @@ netbsd32_from_sioc_vif_req(p, s32p, cmd) } static inline void -netbsd32_from_sioc_sg_req(p, s32p, cmd) - struct sioc_sg_req *p; - struct netbsd32_sioc_sg_req *s32p; - u_long cmd; +netbsd32_from_sioc_sg_req(struct sioc_sg_req *p, struct netbsd32_sioc_sg_req *s32p, u_long cmd) { s32p->src = p->src; @@ -350,10 +302,7 @@ netbsd32_from_sioc_sg_req(p, s32p, cmd) * on the ioctl command before and afterwards. */ int -netbsd32_ioctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_ioctl(struct lwp *l, void *v, register_t *retval) { struct netbsd32_ioctl_args /* { syscallarg(int) fd; diff --git a/sys/compat/netbsd32/netbsd32_ipc.c b/sys/compat/netbsd32/netbsd32_ipc.c index fde0a1edd07..c5febcbf3d3 100644 --- a/sys/compat/netbsd32/netbsd32_ipc.c +++ b/sys/compat/netbsd32/netbsd32_ipc.c @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_ipc.c,v 1.12 2007/06/03 10:55:10 dsl Exp $ */ +/* $NetBSD: netbsd32_ipc.c,v 1.13 2007/12/08 18:36:19 dsl Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_ipc.c,v 1.12 2007/06/03 10:55:10 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_ipc.c,v 1.13 2007/12/08 18:36:19 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_sysv.h" @@ -54,10 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_ipc.c,v 1.12 2007/06/03 10:55:10 dsl Exp $" #if defined(SYSVSEM) int -netbsd32___semctl14(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32___semctl14(struct lwp *l, void *v, register_t *retval) { return do_netbsd32___semctl14(l, v, retval, NULL); } @@ -138,10 +135,7 @@ do_netbsd32___semctl14(struct lwp *l, void *v, register_t *retval, void *vkarg) } int -netbsd32_semget(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_semget(struct lwp *l, void *v, register_t *retval) { struct netbsd32_semget_args /* { syscallarg(netbsd32_key_t) key; @@ -157,10 +151,7 @@ netbsd32_semget(l, v, retval) } int -netbsd32_semop(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_semop(struct lwp *l, void *v, register_t *retval) { struct netbsd32_semop_args /* { syscallarg(int) semid; @@ -176,10 +167,7 @@ netbsd32_semop(l, v, retval) } int -netbsd32_semconfig(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_semconfig(struct lwp *l, void *v, register_t *retval) { struct netbsd32_semconfig_args /* { syscallarg(int) flag; @@ -194,10 +182,7 @@ netbsd32_semconfig(l, v, retval) #if defined(SYSVMSG) int -netbsd32___msgctl13(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32___msgctl13(struct lwp *l, void *v, register_t *retval) { struct netbsd32___msgctl13_args /* { syscallarg(int) msqid; @@ -228,10 +213,7 @@ netbsd32___msgctl13(l, v, retval) } int -netbsd32_msgget(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_msgget(struct lwp *l, void *v, register_t *retval) { struct netbsd32_msgget_args /* { syscallarg(netbsd32_key_t) key; @@ -260,10 +242,7 @@ netbsd32_msgsnd_fetch_type(const void *src, void *dst, size_t size) } int -netbsd32_msgsnd(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_msgsnd(struct lwp *l, void *v, register_t *retval) { struct netbsd32_msgsnd_args /* { syscallarg(int) msqid; @@ -291,10 +270,7 @@ netbsd32_msgrcv_put_type(const void *src, void *dst, size_t size) } int -netbsd32_msgrcv(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_msgrcv(struct lwp *l, void *v, register_t *retval) { struct netbsd32_msgrcv_args /* { syscallarg(int) msqid; @@ -314,10 +290,7 @@ netbsd32_msgrcv(l, v, retval) #if defined(SYSVSHM) int -netbsd32_shmat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_shmat(struct lwp *l, void *v, register_t *retval) { struct netbsd32_shmat_args /* { syscallarg(int) shmid; @@ -333,10 +306,7 @@ netbsd32_shmat(l, v, retval) } int -netbsd32___shmctl13(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32___shmctl13(struct lwp *l, void *v, register_t *retval) { struct netbsd32___shmctl13_args /* { syscallarg(int) shmid; @@ -367,10 +337,7 @@ netbsd32___shmctl13(l, v, retval) } int -netbsd32_shmdt(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_shmdt(struct lwp *l, void *v, register_t *retval) { struct netbsd32_shmdt_args /* { syscallarg(const netbsd32_voidp) shmaddr; @@ -382,10 +349,7 @@ netbsd32_shmdt(l, v, retval) } int -netbsd32_shmget(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_shmget(struct lwp *l, void *v, register_t *retval) { struct netbsd32_shmget_args /* { syscallarg(netbsd32_key_t) key; diff --git a/sys/compat/netbsd32/netbsd32_netbsd.c b/sys/compat/netbsd32/netbsd32_netbsd.c index 4f018ba9860..c2550cb7701 100644 --- a/sys/compat/netbsd32/netbsd32_netbsd.c +++ b/sys/compat/netbsd32/netbsd32_netbsd.c @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_netbsd.c,v 1.131 2007/12/04 18:40:20 dsl Exp $ */ +/* $NetBSD: netbsd32_netbsd.c,v 1.132 2007/12/08 18:36:19 dsl Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.131 2007/12/04 18:40:20 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.132 2007/12/08 18:36:19 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_ddb.h" @@ -172,10 +172,7 @@ const struct emul emul_netbsd32 = { */ int -netbsd32_exit(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_exit(struct lwp *l, void *v, register_t *retval) { struct netbsd32_exit_args /* { syscallarg(int) rval; @@ -187,10 +184,7 @@ netbsd32_exit(l, v, retval) } int -netbsd32_read(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_read(struct lwp *l, void *v, register_t *retval) { struct netbsd32_read_args /* { syscallarg(int) fd; @@ -206,10 +200,7 @@ netbsd32_read(l, v, retval) } int -netbsd32_write(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_write(struct lwp *l, void *v, register_t *retval) { struct netbsd32_write_args /* { syscallarg(int) fd; @@ -225,10 +216,7 @@ netbsd32_write(l, v, retval) } int -netbsd32_close(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_close(struct lwp *l, void *v, register_t *retval) { struct netbsd32_close_args /* { syscallarg(int) fd; @@ -240,10 +228,7 @@ netbsd32_close(l, v, retval) } int -netbsd32_open(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_open(struct lwp *l, void *v, register_t *retval) { struct netbsd32_open_args /* { syscallarg(const netbsd32_charp) path; @@ -260,10 +245,7 @@ netbsd32_open(l, v, retval) } int -netbsd32_link(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_link(struct lwp *l, void *v, register_t *retval) { struct netbsd32_link_args /* { syscallarg(const netbsd32_charp) path; @@ -277,10 +259,7 @@ netbsd32_link(l, v, retval) } int -netbsd32_unlink(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_unlink(struct lwp *l, void *v, register_t *retval) { struct netbsd32_unlink_args /* { syscallarg(const netbsd32_charp) path; @@ -293,10 +272,7 @@ netbsd32_unlink(l, v, retval) } int -netbsd32_chdir(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_chdir(struct lwp *l, void *v, register_t *retval) { struct netbsd32_chdir_args /* { syscallarg(const netbsd32_charp) path; @@ -309,10 +285,7 @@ netbsd32_chdir(l, v, retval) } int -netbsd32_fchdir(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_fchdir(struct lwp *l, void *v, register_t *retval) { struct netbsd32_fchdir_args /* { syscallarg(int) fd; @@ -325,10 +298,7 @@ netbsd32_fchdir(l, v, retval) } int -netbsd32_mknod(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_mknod(struct lwp *l, void *v, register_t *retval) { struct netbsd32_mknod_args /* { syscallarg(const netbsd32_charp) path; @@ -345,10 +315,7 @@ netbsd32_mknod(l, v, retval) } int -netbsd32_chmod(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_chmod(struct lwp *l, void *v, register_t *retval) { struct netbsd32_chmod_args /* { syscallarg(const netbsd32_charp) path; @@ -363,10 +330,7 @@ netbsd32_chmod(l, v, retval) } int -netbsd32_chown(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_chown(struct lwp *l, void *v, register_t *retval) { struct netbsd32_chown_args /* { syscallarg(const netbsd32_charp) path; @@ -383,10 +347,7 @@ netbsd32_chown(l, v, retval) } int -netbsd32_break(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_break(struct lwp *l, void *v, register_t *retval) { struct netbsd32_break_args /* { syscallarg(netbsd32_charp) nsize; @@ -399,10 +360,7 @@ netbsd32_break(l, v, retval) } int -netbsd32_mount(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_mount(struct lwp *l, void *v, register_t *retval) { struct netbsd32_mount_args /* { syscallarg(const netbsd32_charp) type; @@ -420,10 +378,7 @@ netbsd32_mount(l, v, retval) } int -netbsd32_unmount(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_unmount(struct lwp *l, void *v, register_t *retval) { struct netbsd32_unmount_args /* { syscallarg(const netbsd32_charp) path; @@ -437,10 +392,7 @@ netbsd32_unmount(l, v, retval) } int -netbsd32_setuid(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_setuid(struct lwp *l, void *v, register_t *retval) { struct netbsd32_setuid_args /* { syscallarg(uid_t) uid; @@ -452,10 +404,7 @@ netbsd32_setuid(l, v, retval) } int -netbsd32_ptrace(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_ptrace(struct lwp *l, void *v, register_t *retval) { #if defined(PTRACE) || defined(_LKM) struct netbsd32_ptrace_args /* { @@ -481,10 +430,7 @@ netbsd32_ptrace(l, v, retval) } int -netbsd32_accept(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_accept(struct lwp *l, void *v, register_t *retval) { struct netbsd32_accept_args /* { syscallarg(int) s; @@ -500,10 +446,7 @@ netbsd32_accept(l, v, retval) } int -netbsd32_getpeername(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_getpeername(struct lwp *l, void *v, register_t *retval) { struct netbsd32_getpeername_args /* { syscallarg(int) fdes; @@ -520,10 +463,7 @@ netbsd32_getpeername(l, v, retval) } int -netbsd32_getsockname(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_getsockname(struct lwp *l, void *v, register_t *retval) { struct netbsd32_getsockname_args /* { syscallarg(int) fdes; @@ -539,10 +479,7 @@ netbsd32_getsockname(l, v, retval) } int -netbsd32_access(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_access(struct lwp *l, void *v, register_t *retval) { struct netbsd32_access_args /* { syscallarg(const netbsd32_charp) path; @@ -557,10 +494,7 @@ netbsd32_access(l, v, retval) } int -netbsd32_chflags(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_chflags(struct lwp *l, void *v, register_t *retval) { struct netbsd32_chflags_args /* { syscallarg(const netbsd32_charp) path; @@ -575,10 +509,7 @@ netbsd32_chflags(l, v, retval) } int -netbsd32_fchflags(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_fchflags(struct lwp *l, void *v, register_t *retval) { struct netbsd32_fchflags_args /* { syscallarg(int) fd; @@ -593,10 +524,7 @@ netbsd32_fchflags(l, v, retval) } int -netbsd32_lchflags(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_lchflags(struct lwp *l, void *v, register_t *retval) { struct netbsd32_lchflags_args /* { syscallarg(const char *) path; @@ -611,10 +539,7 @@ netbsd32_lchflags(l, v, retval) } int -netbsd32_kill(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_kill(struct lwp *l, void *v, register_t *retval) { struct netbsd32_kill_args /* { syscallarg(int) pid; @@ -629,10 +554,7 @@ netbsd32_kill(l, v, retval) } int -netbsd32_dup(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_dup(struct lwp *l, void *v, register_t *retval) { struct netbsd32_dup_args /* { syscallarg(int) fd; @@ -645,10 +567,7 @@ netbsd32_dup(l, v, retval) } int -netbsd32_profil(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_profil(struct lwp *l, void *v, register_t *retval) { struct netbsd32_profil_args /* { syscallarg(netbsd32_caddr_t) samples; @@ -666,10 +585,7 @@ netbsd32_profil(l, v, retval) } int -netbsd32_ktrace(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_ktrace(struct lwp *l, void *v, register_t *retval) { struct netbsd32_ktrace_args /* { syscallarg(const netbsd32_charp) fname; @@ -687,10 +603,7 @@ netbsd32_ktrace(l, v, retval) } int -netbsd32_utrace(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_utrace(struct lwp *l, void *v, register_t *retval) { struct netbsd32_utrace_args /* { syscallarg(const netbsd32_charp) label; @@ -706,10 +619,7 @@ netbsd32_utrace(l, v, retval) } int -netbsd32___getlogin(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32___getlogin(struct lwp *l, void *v, register_t *retval) { struct netbsd32___getlogin_args /* { syscallarg(netbsd32_charp) namebuf; @@ -723,10 +633,7 @@ netbsd32___getlogin(l, v, retval) } int -netbsd32_setlogin(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_setlogin(struct lwp *l, void *v, register_t *retval) { struct netbsd32_setlogin_args /* { syscallarg(const netbsd32_charp) namebuf; @@ -738,10 +645,7 @@ netbsd32_setlogin(l, v, retval) } int -netbsd32_acct(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_acct(struct lwp *l, void *v, register_t *retval) { struct netbsd32_acct_args /* { syscallarg(const netbsd32_charp) path; @@ -753,10 +657,7 @@ netbsd32_acct(l, v, retval) } int -netbsd32_revoke(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_revoke(struct lwp *l, void *v, register_t *retval) { struct netbsd32_revoke_args /* { syscallarg(const netbsd32_charp) path; @@ -769,10 +670,7 @@ netbsd32_revoke(l, v, retval) } int -netbsd32_symlink(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_symlink(struct lwp *l, void *v, register_t *retval) { struct netbsd32_symlink_args /* { syscallarg(const netbsd32_charp) path; @@ -787,10 +685,7 @@ netbsd32_symlink(l, v, retval) } int -netbsd32_readlink(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_readlink(struct lwp *l, void *v, register_t *retval) { struct netbsd32_readlink_args /* { syscallarg(const netbsd32_charp) path; @@ -807,10 +702,7 @@ netbsd32_readlink(l, v, retval) } int -netbsd32_umask(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_umask(struct lwp *l, void *v, register_t *retval) { struct netbsd32_umask_args /* { syscallarg(mode_t) newmask; @@ -822,10 +714,7 @@ netbsd32_umask(l, v, retval) } int -netbsd32_chroot(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_chroot(struct lwp *l, void *v, register_t *retval) { struct netbsd32_chroot_args /* { syscallarg(const netbsd32_charp) path; @@ -837,10 +726,7 @@ netbsd32_chroot(l, v, retval) } int -netbsd32_sbrk(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_sbrk(struct lwp *l, void *v, register_t *retval) { struct netbsd32_sbrk_args /* { syscallarg(int) incr; @@ -852,10 +738,7 @@ netbsd32_sbrk(l, v, retval) } int -netbsd32_sstk(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_sstk(struct lwp *l, void *v, register_t *retval) { struct netbsd32_sstk_args /* { syscallarg(int) incr; @@ -867,10 +750,7 @@ netbsd32_sstk(l, v, retval) } int -netbsd32_munmap(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_munmap(struct lwp *l, void *v, register_t *retval) { struct netbsd32_munmap_args /* { syscallarg(netbsd32_voidp) addr; @@ -884,10 +764,7 @@ netbsd32_munmap(l, v, retval) } int -netbsd32_mprotect(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_mprotect(struct lwp *l, void *v, register_t *retval) { struct netbsd32_mprotect_args /* { syscallarg(netbsd32_voidp) addr; @@ -903,10 +780,7 @@ netbsd32_mprotect(l, v, retval) } int -netbsd32_madvise(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_madvise(struct lwp *l, void *v, register_t *retval) { struct netbsd32_madvise_args /* { syscallarg(netbsd32_voidp) addr; @@ -922,10 +796,7 @@ netbsd32_madvise(l, v, retval) } int -netbsd32_mincore(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_mincore(struct lwp *l, void *v, register_t *retval) { struct netbsd32_mincore_args /* { syscallarg(netbsd32_caddr_t) addr; @@ -942,10 +813,7 @@ netbsd32_mincore(l, v, retval) /* XXX MOVE ME XXX ? */ int -netbsd32_getgroups(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_getgroups(struct lwp *l, void *v, register_t *retval) { struct netbsd32_getgroups_args /* { syscallarg(int) gidsetsize; @@ -961,10 +829,7 @@ netbsd32_getgroups(l, v, retval) } int -netbsd32_setgroups(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_setgroups(struct lwp *l, void *v, register_t *retval) { struct netbsd32_setgroups_args /* { syscallarg(int) gidsetsize; @@ -978,10 +843,7 @@ netbsd32_setgroups(l, v, retval) } int -netbsd32_setpgid(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_setpgid(struct lwp *l, void *v, register_t *retval) { struct netbsd32_setpgid_args /* { syscallarg(int) pid; @@ -995,10 +857,7 @@ netbsd32_setpgid(l, v, retval) } int -netbsd32_fcntl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_fcntl(struct lwp *l, void *v, register_t *retval) { struct netbsd32_fcntl_args /* { syscallarg(int) fd; @@ -1015,10 +874,7 @@ netbsd32_fcntl(l, v, retval) } int -netbsd32_dup2(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_dup2(struct lwp *l, void *v, register_t *retval) { struct netbsd32_dup2_args /* { syscallarg(int) from; @@ -1032,10 +888,7 @@ netbsd32_dup2(l, v, retval) } int -netbsd32_fsync(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_fsync(struct lwp *l, void *v, register_t *retval) { struct netbsd32_fsync_args /* { syscallarg(int) fd; @@ -1047,10 +900,7 @@ netbsd32_fsync(l, v, retval) } int -netbsd32_setpriority(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_setpriority(struct lwp *l, void *v, register_t *retval) { struct netbsd32_setpriority_args /* { syscallarg(int) which; @@ -1066,10 +916,7 @@ netbsd32_setpriority(l, v, retval) } int -netbsd32_sys___socket30(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_sys___socket30(struct lwp *l, void *v, register_t *retval) { struct netbsd32_sys___socket30_args /* { syscallarg(int) domain; @@ -1085,10 +932,7 @@ netbsd32_sys___socket30(l, v, retval) } int -netbsd32_connect(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_connect(struct lwp *l, void *v, register_t *retval) { struct netbsd32_connect_args /* { syscallarg(int) s; @@ -1104,10 +948,7 @@ netbsd32_connect(l, v, retval) } int -netbsd32_getpriority(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_getpriority(struct lwp *l, void *v, register_t *retval) { struct netbsd32_getpriority_args /* { syscallarg(int) which; @@ -1121,10 +962,7 @@ netbsd32_getpriority(l, v, retval) } int -netbsd32_bind(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_bind(struct lwp *l, void *v, register_t *retval) { struct netbsd32_bind_args /* { syscallarg(int) s; @@ -1140,10 +978,7 @@ netbsd32_bind(l, v, retval) } int -netbsd32_setsockopt(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_setsockopt(struct lwp *l, void *v, register_t *retval) { struct netbsd32_setsockopt_args /* { syscallarg(int) s; @@ -1164,10 +999,7 @@ netbsd32_setsockopt(l, v, retval) } int -netbsd32_listen(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_listen(struct lwp *l, void *v, register_t *retval) { struct netbsd32_listen_args /* { syscallarg(int) s; @@ -1181,10 +1013,7 @@ netbsd32_listen(l, v, retval) } int -netbsd32_fchown(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_fchown(struct lwp *l, void *v, register_t *retval) { struct netbsd32_fchown_args /* { syscallarg(int) fd; @@ -1200,10 +1029,7 @@ netbsd32_fchown(l, v, retval) } int -netbsd32_fchmod(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_fchmod(struct lwp *l, void *v, register_t *retval) { struct netbsd32_fchmod_args /* { syscallarg(int) fd; @@ -1217,10 +1043,7 @@ netbsd32_fchmod(l, v, retval) } int -netbsd32_setreuid(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_setreuid(struct lwp *l, void *v, register_t *retval) { struct netbsd32_setreuid_args /* { syscallarg(uid_t) ruid; @@ -1234,10 +1057,7 @@ netbsd32_setreuid(l, v, retval) } int -netbsd32_setregid(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_setregid(struct lwp *l, void *v, register_t *retval) { struct netbsd32_setregid_args /* { syscallarg(gid_t) rgid; @@ -1251,10 +1071,7 @@ netbsd32_setregid(l, v, retval) } int -netbsd32_getsockopt(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_getsockopt(struct lwp *l, void *v, register_t *retval) { struct netbsd32_getsockopt_args /* { syscallarg(int) s; @@ -1274,10 +1091,7 @@ netbsd32_getsockopt(l, v, retval) } int -netbsd32_rename(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_rename(struct lwp *l, void *v, register_t *retval) { struct netbsd32_rename_args /* { syscallarg(const netbsd32_charp) from; @@ -1292,10 +1106,7 @@ netbsd32_rename(l, v, retval) } int -netbsd32_flock(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_flock(struct lwp *l, void *v, register_t *retval) { struct netbsd32_flock_args /* { syscallarg(int) fd; @@ -1310,10 +1121,7 @@ netbsd32_flock(l, v, retval) } int -netbsd32_mkfifo(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_mkfifo(struct lwp *l, void *v, register_t *retval) { struct netbsd32_mkfifo_args /* { syscallarg(const netbsd32_charp) path; @@ -1327,10 +1135,7 @@ netbsd32_mkfifo(l, v, retval) } int -netbsd32_shutdown(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_shutdown(struct lwp *l, void *v, register_t *retval) { struct netbsd32_shutdown_args /* { syscallarg(int) s; @@ -1344,10 +1149,7 @@ netbsd32_shutdown(l, v, retval) } int -netbsd32_socketpair(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_socketpair(struct lwp *l, void *v, register_t *retval) { struct netbsd32_socketpair_args /* { syscallarg(int) domain; @@ -1366,10 +1168,7 @@ netbsd32_socketpair(l, v, retval) } int -netbsd32_mkdir(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_mkdir(struct lwp *l, void *v, register_t *retval) { struct netbsd32_mkdir_args /* { syscallarg(const netbsd32_charp) path; @@ -1383,10 +1182,7 @@ netbsd32_mkdir(l, v, retval) } int -netbsd32_rmdir(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_rmdir(struct lwp *l, void *v, register_t *retval) { struct netbsd32_rmdir_args /* { syscallarg(const netbsd32_charp) path; @@ -1398,10 +1194,7 @@ netbsd32_rmdir(l, v, retval) } int -netbsd32_quotactl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_quotactl(struct lwp *l, void *v, register_t *retval) { struct netbsd32_quotactl_args /* { syscallarg(const netbsd32_charp) path; @@ -1420,10 +1213,7 @@ netbsd32_quotactl(l, v, retval) #if defined(NFS) || defined(NFSSERVER) int -netbsd32_nfssvc(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_nfssvc(struct lwp *l, void *v, register_t *retval) { #if 0 struct netbsd32_nfssvc_args /* { @@ -1443,10 +1233,7 @@ netbsd32_nfssvc(l, v, retval) #endif int -netbsd32___getfh30(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32___getfh30(struct lwp *l, void *v, register_t *retval) { struct netbsd32___getfh30_args /* { syscallarg(const netbsd32_charp) fname; @@ -1498,10 +1285,7 @@ netbsd32___getfh30(l, v, retval) } int -netbsd32_pread(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_pread(struct lwp *l, void *v, register_t *retval) { struct netbsd32_pread_args /* { syscallarg(int) fd; @@ -1525,10 +1309,7 @@ netbsd32_pread(l, v, retval) } int -netbsd32_pwrite(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_pwrite(struct lwp *l, void *v, register_t *retval) { struct netbsd32_pwrite_args /* { syscallarg(int) fd; @@ -1552,10 +1333,7 @@ netbsd32_pwrite(l, v, retval) } int -netbsd32_setgid(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_setgid(struct lwp *l, void *v, register_t *retval) { struct netbsd32_setgid_args /* { syscallarg(gid_t) gid; @@ -1567,10 +1345,7 @@ netbsd32_setgid(l, v, retval) } int -netbsd32_setegid(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_setegid(struct lwp *l, void *v, register_t *retval) { struct netbsd32_setegid_args /* { syscallarg(gid_t) egid; @@ -1582,10 +1357,7 @@ netbsd32_setegid(l, v, retval) } int -netbsd32_seteuid(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_seteuid(struct lwp *l, void *v, register_t *retval) { struct netbsd32_seteuid_args /* { syscallarg(gid_t) euid; @@ -1598,40 +1370,28 @@ netbsd32_seteuid(l, v, retval) #ifdef LFS int -netbsd32_sys_lfs_bmapv(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_sys_lfs_bmapv(struct lwp *l, void *v, register_t *retval) { return (ENOSYS); /* XXX */ } int -netbsd32_sys_lfs_markv(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_sys_lfs_markv(struct lwp *l, void *v, register_t *retval) { return (ENOSYS); /* XXX */ } int -netbsd32_sys_lfs_segclean(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_sys_lfs_segclean(struct lwp *l, void *v, register_t *retval) { return (ENOSYS); /* XXX */ } int -netbsd32_sys_lfs_segwait(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_sys_lfs_segwait(struct lwp *l, void *v, register_t *retval) { return (ENOSYS); /* XXX */ @@ -1639,10 +1399,7 @@ netbsd32_sys_lfs_segwait(l, v, retval) #endif int -netbsd32_pathconf(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_pathconf(struct lwp *l, void *v, register_t *retval) { struct netbsd32_pathconf_args /* { syscallarg(int) fd; @@ -1660,10 +1417,7 @@ netbsd32_pathconf(l, v, retval) } int -netbsd32_fpathconf(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_fpathconf(struct lwp *l, void *v, register_t *retval) { struct netbsd32_fpathconf_args /* { syscallarg(int) fd; @@ -1681,10 +1435,7 @@ netbsd32_fpathconf(l, v, retval) } int -netbsd32_getrlimit(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_getrlimit(struct lwp *l, void *v, register_t *retval) { struct netbsd32_getrlimit_args /* { syscallarg(int) which; @@ -1699,10 +1450,7 @@ netbsd32_getrlimit(l, v, retval) } int -netbsd32_setrlimit(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_setrlimit(struct lwp *l, void *v, register_t *retval) { struct netbsd32_setrlimit_args /* { syscallarg(int) which; @@ -1737,10 +1485,7 @@ netbsd32_setrlimit(l, v, retval) } int -netbsd32_mmap(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_mmap(struct lwp *l, void *v, register_t *retval) { struct netbsd32_mmap_args /* { syscallarg(netbsd32_voidp) addr; @@ -1771,10 +1516,7 @@ netbsd32_mmap(l, v, retval) } int -netbsd32_lseek(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_lseek(struct lwp *l, void *v, register_t *retval) { struct netbsd32_lseek_args /* { syscallarg(int) fd; @@ -1798,10 +1540,7 @@ netbsd32_lseek(l, v, retval) } int -netbsd32_truncate(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_truncate(struct lwp *l, void *v, register_t *retval) { struct netbsd32_truncate_args /* { syscallarg(const netbsd32_charp) path; @@ -1817,10 +1556,7 @@ netbsd32_truncate(l, v, retval) } int -netbsd32_ftruncate(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_ftruncate(struct lwp *l, void *v, register_t *retval) { struct netbsd32_ftruncate_args /* { syscallarg(int) fd; @@ -1836,10 +1572,7 @@ netbsd32_ftruncate(l, v, retval) } int -netbsd32_mlock(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_mlock(struct lwp *l, void *v, register_t *retval) { struct netbsd32_mlock_args /* { syscallarg(const netbsd32_voidp) addr; @@ -1853,10 +1586,7 @@ netbsd32_mlock(l, v, retval) } int -netbsd32_munlock(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_munlock(struct lwp *l, void *v, register_t *retval) { struct netbsd32_munlock_args /* { syscallarg(const netbsd32_voidp) addr; @@ -1870,10 +1600,7 @@ netbsd32_munlock(l, v, retval) } int -netbsd32_undelete(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_undelete(struct lwp *l, void *v, register_t *retval) { struct netbsd32_undelete_args /* { syscallarg(const netbsd32_charp) path; @@ -1885,10 +1612,7 @@ netbsd32_undelete(l, v, retval) } int -netbsd32_getpgid(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_getpgid(struct lwp *l, void *v, register_t *retval) { struct netbsd32_getpgid_args /* { syscallarg(pid_t) pid; @@ -1900,10 +1624,7 @@ netbsd32_getpgid(l, v, retval) } int -netbsd32_reboot(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_reboot(struct lwp *l, void *v, register_t *retval) { struct netbsd32_reboot_args /* { syscallarg(int) opt; @@ -1918,10 +1639,7 @@ netbsd32_reboot(l, v, retval) #include <sys/poll.h> int -netbsd32_poll(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_poll(struct lwp *l, void *v, register_t *retval) { struct netbsd32_poll_args /* { syscallarg(netbsd32_pollfdp_t) fds; @@ -1938,10 +1656,7 @@ netbsd32_poll(l, v, retval) } int -netbsd32_fdatasync(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_fdatasync(struct lwp *l, void *v, register_t *retval) { struct netbsd32_fdatasync_args /* { syscallarg(int) fd; @@ -1953,10 +1668,7 @@ netbsd32_fdatasync(l, v, retval) } int -netbsd32___posix_rename(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32___posix_rename(struct lwp *l, void *v, register_t *retval) { struct netbsd32___posix_rename_args /* { syscallarg(const netbsd32_charp) from; @@ -1970,10 +1682,7 @@ netbsd32___posix_rename(l, v, retval) } int -netbsd32_swapctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_swapctl(struct lwp *l, void *v, register_t *retval) { struct netbsd32_swapctl_args /* { syscallarg(int) cmd; @@ -1989,10 +1698,7 @@ netbsd32_swapctl(l, v, retval) } int -netbsd32_minherit(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_minherit(struct lwp *l, void *v, register_t *retval) { struct netbsd32_minherit_args /* { syscallarg(netbsd32_voidp) addr; @@ -2008,10 +1714,7 @@ netbsd32_minherit(l, v, retval) } int -netbsd32_lchmod(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_lchmod(struct lwp *l, void *v, register_t *retval) { struct netbsd32_lchmod_args /* { syscallarg(const netbsd32_charp) path; @@ -2025,10 +1728,7 @@ netbsd32_lchmod(l, v, retval) } int -netbsd32_lchown(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_lchown(struct lwp *l, void *v, register_t *retval) { struct netbsd32_lchown_args /* { syscallarg(const netbsd32_charp) path; @@ -2044,10 +1744,7 @@ netbsd32_lchown(l, v, retval) } int -netbsd32___msync13(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32___msync13(struct lwp *l, void *v, register_t *retval) { struct netbsd32___msync13_args /* { syscallarg(netbsd32_voidp) addr; @@ -2063,10 +1760,7 @@ netbsd32___msync13(l, v, retval) } int -netbsd32___posix_chown(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32___posix_chown(struct lwp *l, void *v, register_t *retval) { struct netbsd32___posix_chown_args /* { syscallarg(const netbsd32_charp) path; @@ -2082,10 +1776,7 @@ netbsd32___posix_chown(l, v, retval) } int -netbsd32___posix_fchown(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32___posix_fchown(struct lwp *l, void *v, register_t *retval) { struct netbsd32___posix_fchown_args /* { syscallarg(int) fd; @@ -2101,10 +1792,7 @@ netbsd32___posix_fchown(l, v, retval) } int -netbsd32___posix_lchown(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32___posix_lchown(struct lwp *l, void *v, register_t *retval) { struct netbsd32___posix_lchown_args /* { syscallarg(const netbsd32_charp) path; @@ -2120,10 +1808,7 @@ netbsd32___posix_lchown(l, v, retval) } int -netbsd32_getsid(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_getsid(struct lwp *l, void *v, register_t *retval) { struct netbsd32_getsid_args /* { syscallarg(pid_t) pid; @@ -2135,10 +1820,7 @@ netbsd32_getsid(l, v, retval) } int -netbsd32_fktrace(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_fktrace(struct lwp *l, void *v, register_t *retval) { struct netbsd32_fktrace_args /* { syscallarg(const int) fd; @@ -2232,10 +1914,7 @@ int netbsd32_fchroot(l, v, retval) * and call the device open routine if any. */ int -netbsd32___fhopen40(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32___fhopen40(struct lwp *l, void *v, register_t *retval) { struct netbsd32___fhopen40_args /* { syscallarg(const netbsd32_pointer_t *) fhp; @@ -2252,10 +1931,7 @@ netbsd32___fhopen40(l, v, retval) /* virtual memory syscalls */ int -netbsd32_ovadvise(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_ovadvise(struct lwp *l, void *v, register_t *retval) { struct netbsd32_ovadvise_args /* { syscallarg(int) anom; @@ -2573,10 +2249,7 @@ netbsd32_extattr_list_link(struct lwp *l, void *v, register_t *retval) } int -netbsd32_mlockall(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_mlockall(struct lwp *l, void *v, register_t *retval) { struct netbsd32_mlockall_args /* { syscallarg(int) flags; diff --git a/sys/compat/netbsd32/netbsd32_select.c b/sys/compat/netbsd32/netbsd32_select.c index bfc5da47598..60f336c28ed 100644 --- a/sys/compat/netbsd32/netbsd32_select.c +++ b/sys/compat/netbsd32/netbsd32_select.c @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_select.c,v 1.12 2007/03/18 21:38:34 dsl Exp $ */ +/* $NetBSD: netbsd32_select.c,v 1.13 2007/12/08 18:36:19 dsl Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_select.c,v 1.12 2007/03/18 21:38:34 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_select.c,v 1.13 2007/12/08 18:36:19 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -79,10 +79,7 @@ netbsd32_select(struct lwp *l, void *v, register_t *retval) } int -netbsd32_pselect(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_pselect(struct lwp *l, void *v, register_t *retval) { struct netbsd32_pselect_args /* { syscallarg(int) nd; @@ -119,10 +116,7 @@ netbsd32_pselect(l, v, retval) } int -netbsd32_pollts(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_pollts(struct lwp *l, void *v, register_t *retval) { struct netbsd32_pollts_args /* { syscallarg(struct netbsd32_pollfdp_t) fds; diff --git a/sys/compat/netbsd32/netbsd32_signal.c b/sys/compat/netbsd32/netbsd32_signal.c index 2914005ca07..a00c48d3411 100644 --- a/sys/compat/netbsd32/netbsd32_signal.c +++ b/sys/compat/netbsd32/netbsd32_signal.c @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_signal.c,v 1.26 2007/10/08 18:07:24 ad Exp $ */ +/* $NetBSD: netbsd32_signal.c,v 1.27 2007/12/08 18:36:19 dsl Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.26 2007/10/08 18:07:24 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.27 2007/12/08 18:36:19 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -60,10 +60,7 @@ static void netbsd32_si32_to_si(siginfo_t *, const siginfo32_t *); int -netbsd32_sigaction(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_sigaction(struct lwp *l, void *v, register_t *retval) { struct netbsd32_sigaction_args /* { syscallarg(int) signum; @@ -103,10 +100,7 @@ netbsd32_sigaction(l, v, retval) } int -netbsd32___sigaltstack14(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32___sigaltstack14(struct lwp *l, void *v, register_t *retval) { struct netbsd32___sigaltstack14_args /* { syscallarg(const netbsd32_sigaltstackp_t) nss; @@ -117,10 +111,7 @@ netbsd32___sigaltstack14(l, v, retval) /* ARGSUSED */ int -netbsd32___sigaction14(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32___sigaction14(struct lwp *l, void *v, register_t *retval) { struct netbsd32___sigaction14_args /* { syscallarg(int) signum; @@ -158,10 +149,7 @@ netbsd32___sigaction14(l, v, retval) /* ARGSUSED */ int -netbsd32___sigaction_sigtramp(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32___sigaction_sigtramp(struct lwp *l, void *v, register_t *retval) { struct netbsd32___sigaction_sigtramp_args /* { syscallarg(int) signum; diff --git a/sys/compat/netbsd32/netbsd32_socket.c b/sys/compat/netbsd32/netbsd32_socket.c index a13ffb2c731..f1b6662bab6 100644 --- a/sys/compat/netbsd32/netbsd32_socket.c +++ b/sys/compat/netbsd32/netbsd32_socket.c @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_socket.c,v 1.28 2007/12/04 18:40:20 dsl Exp $ */ +/* $NetBSD: netbsd32_socket.c,v 1.29 2007/12/08 18:36:19 dsl Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_socket.c,v 1.28 2007/12/04 18:40:20 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_socket.c,v 1.29 2007/12/08 18:36:19 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -56,10 +56,7 @@ static int recvit32(struct lwp *, int, struct netbsd32_msghdr *, struct iovec *, register_t *); int -netbsd32_recvmsg(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_recvmsg(struct lwp *l, void *v, register_t *retval) { struct netbsd32_recvmsg_args /* { syscallarg(int) s; @@ -99,13 +96,7 @@ done: } int -recvit32(l, s, mp, iov, namelenp, retsize) - struct lwp *l; - int s; - struct netbsd32_msghdr *mp; - struct iovec *iov; - void *namelenp; - register_t *retsize; +recvit32(struct lwp *l, int s, struct netbsd32_msghdr *mp, struct iovec *iov, void *namelenp, register_t *retsize) { struct file *fp; struct uio auio; @@ -227,10 +218,7 @@ recvit32(l, s, mp, iov, namelenp, retsize) } int -netbsd32_sendmsg(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_sendmsg(struct lwp *l, void *v, register_t *retval) { struct netbsd32_sendmsg_args /* { syscallarg(int) s; @@ -275,10 +263,7 @@ done: } int -netbsd32_recvfrom(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_recvfrom(struct lwp *l, void *v, register_t *retval) { struct netbsd32_recvfrom_args /* { syscallarg(int) s; @@ -311,10 +296,7 @@ netbsd32_recvfrom(l, v, retval) } int -netbsd32_sendto(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_sendto(struct lwp *l, void *v, register_t *retval) { struct netbsd32_sendto_args /* { syscallarg(int) s; diff --git a/sys/compat/netbsd32/netbsd32_sysctl.c b/sys/compat/netbsd32/netbsd32_sysctl.c index cc246861dd0..8c28a7e86c9 100644 --- a/sys/compat/netbsd32/netbsd32_sysctl.c +++ b/sys/compat/netbsd32/netbsd32_sysctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_sysctl.c,v 1.25 2007/08/15 12:07:31 ad Exp $ */ +/* $NetBSD: netbsd32_sysctl.c,v 1.26 2007/12/08 18:36:19 dsl Exp $ */ /* * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.25 2007/08/15 12:07:31 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysctl.c,v 1.26 2007/12/08 18:36:19 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_ddb.h" @@ -150,10 +150,7 @@ SYSCTL_SETUP(netbsd32_sysctl_emul_setup, "sysctl netbsd32 shadow tree setup") } int -netbsd32___sysctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32___sysctl(struct lwp *l, void *v, register_t *retval) { struct netbsd32___sysctl_args /* { syscallarg(netbsd32_intp) name; diff --git a/sys/compat/netbsd32/netbsd32_time.c b/sys/compat/netbsd32/netbsd32_time.c index 8a9effbd9ba..6f45ad94da2 100644 --- a/sys/compat/netbsd32/netbsd32_time.c +++ b/sys/compat/netbsd32/netbsd32_time.c @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_time.c,v 1.28 2007/11/25 00:35:27 elad Exp $ */ +/* $NetBSD: netbsd32_time.c,v 1.29 2007/12/08 18:36:20 dsl Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_time.c,v 1.28 2007/11/25 00:35:27 elad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_time.c,v 1.29 2007/12/08 18:36:20 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_ntp.h" @@ -56,10 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_time.c,v 1.28 2007/11/25 00:35:27 elad Exp #ifdef NTP int -netbsd32_ntp_gettime(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_ntp_gettime(struct lwp *l, void *v, register_t *retval) { struct netbsd32_ntp_gettime_args /* { syscallarg(netbsd32_ntptimevalp_t) ntvp; @@ -88,10 +85,7 @@ netbsd32_ntp_gettime(l, v, retval) #ifdef COMPAT_30 int -compat_30_netbsd32_ntp_gettime(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_30_netbsd32_ntp_gettime(struct lwp *l, void *v, register_t *retval) { struct compat_30_netbsd32_ntp_gettime_args /* { syscallarg(netbsd32_ntptimevalp_t) ntvp; @@ -118,10 +112,7 @@ compat_30_netbsd32_ntp_gettime(l, v, retval) #endif int -netbsd32_ntp_adjtime(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_ntp_adjtime(struct lwp *l, void *v, register_t *retval) { struct netbsd32_ntp_adjtime_args /* { syscallarg(netbsd32_timexp_t) tp; @@ -158,10 +149,7 @@ netbsd32_ntp_adjtime(l, v, retval) } #else /* !NTP */ int -netbsd32_ntp_gettime(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_ntp_gettime(struct lwp *l, void *v, register_t *retval) { return (ENOSYS); @@ -169,10 +157,7 @@ netbsd32_ntp_gettime(l, v, retval) #ifdef COMPAT_30 int -compat_30_netbsd32_ntp_gettime(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +compat_30_netbsd32_ntp_gettime(struct lwp *l, void *v, register_t *retval) { return (ENOSYS); @@ -180,10 +165,7 @@ compat_30_netbsd32_ntp_gettime(l, v, retval) #endif int -netbsd32_ntp_adjtime(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_ntp_adjtime(struct lwp *l, void *v, register_t *retval) { return (ENOSYS); @@ -191,10 +173,7 @@ netbsd32_ntp_adjtime(l, v, retval) #endif /* NTP */ int -netbsd32_setitimer(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_setitimer(struct lwp *l, void *v, register_t *retval) { struct netbsd32_setitimer_args /* { syscallarg(int) which; @@ -229,10 +208,7 @@ netbsd32_setitimer(l, v, retval) } int -netbsd32_getitimer(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_getitimer(struct lwp *l, void *v, register_t *retval) { struct netbsd32_getitimer_args /* { syscallarg(int) which; @@ -252,10 +228,7 @@ netbsd32_getitimer(l, v, retval) } int -netbsd32_gettimeofday(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_gettimeofday(struct lwp *l, void *v, register_t *retval) { struct netbsd32_gettimeofday_args /* { syscallarg(netbsd32_timevalp_t) tp; @@ -286,10 +259,7 @@ netbsd32_gettimeofday(l, v, retval) } int -netbsd32_settimeofday(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_settimeofday(struct lwp *l, void *v, register_t *retval) { struct netbsd32_settimeofday_args /* { syscallarg(const netbsd32_timevalp_t) tv; @@ -323,10 +293,7 @@ netbsd32_settimeofday(l, v, retval) } int -netbsd32_adjtime(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_adjtime(struct lwp *l, void *v, register_t *retval) { struct netbsd32_adjtime_args /* { syscallarg(const netbsd32_timevalp_t) delta; @@ -422,10 +389,7 @@ netbsd32_adjtime(l, v, retval) } int -netbsd32_clock_gettime(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_clock_gettime(struct lwp *l, void *v, register_t *retval) { struct netbsd32_clock_gettime_args /* { syscallarg(netbsd32_clockid_t) clock_id; @@ -446,10 +410,7 @@ netbsd32_clock_gettime(l, v, retval) } int -netbsd32_clock_settime(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_clock_settime(struct lwp *l, void *v, register_t *retval) { struct netbsd32_clock_settime_args /* { syscallarg(netbsd32_clockid_t) clock_id; @@ -472,10 +433,7 @@ netbsd32_clock_settime(l, v, retval) } int -netbsd32_clock_getres(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_clock_getres(struct lwp *l, void *v, register_t *retval) { struct netbsd32_clock_getres_args /* { syscallarg(netbsd32_clockid_t) clock_id; @@ -502,10 +460,7 @@ netbsd32_clock_getres(l, v, retval) } int -netbsd32_nanosleep(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_nanosleep(struct lwp *l, void *v, register_t *retval) { struct netbsd32_nanosleep_args /* { syscallarg(const netbsd32_timespecp_t) rqtp; diff --git a/sys/compat/netbsd32/netbsd32_wait.c b/sys/compat/netbsd32/netbsd32_wait.c index a1f44ece7f2..9fc982424b7 100644 --- a/sys/compat/netbsd32/netbsd32_wait.c +++ b/sys/compat/netbsd32/netbsd32_wait.c @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_wait.c,v 1.15 2007/05/07 16:53:19 dsl Exp $ */ +/* $NetBSD: netbsd32_wait.c,v 1.16 2007/12/08 18:36:20 dsl Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_wait.c,v 1.15 2007/05/07 16:53:19 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_wait.c,v 1.16 2007/12/08 18:36:20 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -48,10 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_wait.c,v 1.15 2007/05/07 16:53:19 dsl Exp $ #include <compat/netbsd32/netbsd32_conv.h> int -netbsd32_wait4(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_wait4(struct lwp *l, void *v, register_t *retval) { struct netbsd32_wait4_args /* { syscallarg(int) pid; @@ -84,10 +81,7 @@ netbsd32_wait4(l, v, retval) int -netbsd32_getrusage(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +netbsd32_getrusage(struct lwp *l, void *v, register_t *retval) { struct netbsd32_getrusage_args /* { syscallarg(int) who; diff --git a/sys/compat/osf1/osf1_cvt.c b/sys/compat/osf1/osf1_cvt.c index 9eade189624..6f61baa7646 100644 --- a/sys/compat/osf1/osf1_cvt.c +++ b/sys/compat/osf1/osf1_cvt.c @@ -1,4 +1,4 @@ -/* $NetBSD: osf1_cvt.c,v 1.24 2007/07/20 13:48:24 he Exp $ */ +/* $NetBSD: osf1_cvt.c,v 1.25 2007/12/08 18:36:20 dsl Exp $ */ /* * Copyright (c) 1999 Christopher G. Demetriou. All rights reserved. @@ -58,7 +58,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: osf1_cvt.c,v 1.24 2007/07/20 13:48:24 he Exp $"); +__KERNEL_RCSID(0, "$NetBSD: osf1_cvt.c,v 1.25 2007/12/08 18:36:20 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -291,9 +291,7 @@ const struct emul_flags_xtab osf1_wait_options_xtab[] = { }; void -osf1_cvt_flock_from_native(nf, of) - const struct flock *nf; - struct osf1_flock *of; +osf1_cvt_flock_from_native(const struct flock *nf, struct osf1_flock *of) { memset(of, 0, sizeof of); @@ -332,9 +330,7 @@ osf1_cvt_flock_from_native(nf, of) } int -osf1_cvt_flock_to_native(of, nf) - const struct osf1_flock *of; - struct flock *nf; +osf1_cvt_flock_to_native(const struct osf1_flock *of, struct flock *nf) { memset(nf, 0, sizeof nf); @@ -381,9 +377,7 @@ osf1_cvt_flock_to_native(of, nf) } int -osf1_cvt_msghdr_xopen_to_native(omh, bmh) - const struct osf1_msghdr_xopen *omh; - struct msghdr *bmh; +osf1_cvt_msghdr_xopen_to_native(const struct osf1_msghdr_xopen *omh, struct msghdr *bmh) { unsigned long leftovers; @@ -468,9 +462,7 @@ osf1_cvt_pathconf_name_to_native(oname, bnamep) * Convert from as rusage structure to an osf1 rusage structure. */ void -osf1_cvt_rusage_from_native(ru, oru) - const struct rusage *ru; - struct osf1_rusage *oru; +osf1_cvt_rusage_from_native(const struct rusage *ru, struct osf1_rusage *oru) { oru->ru_utime.tv_sec = ru->ru_utime.tv_sec; @@ -499,9 +491,7 @@ osf1_cvt_rusage_from_native(ru, oru) * XXX: Only a subset of the flags is currently implemented. */ void -osf1_cvt_sigaction_from_native(bsa, osa) - const struct sigaction *bsa; - struct osf1_sigaction *osa; +osf1_cvt_sigaction_from_native(const struct sigaction *bsa, struct osf1_sigaction *osa) { osa->osf1_sa_handler = bsa->sa_handler; @@ -513,9 +503,7 @@ osf1_cvt_sigaction_from_native(bsa, osa) } int -osf1_cvt_sigaction_to_native(osa, bsa) - const struct osf1_sigaction *osa; - struct sigaction *bsa; +osf1_cvt_sigaction_to_native(const struct osf1_sigaction *osa, struct sigaction *bsa) { bsa->sa_handler = osa->osf1_sa_handler; @@ -530,9 +518,7 @@ osf1_cvt_sigaction_to_native(osa, bsa) } void -osf1_cvt_sigset_from_native(bss, oss) - const sigset_t *bss; - osf1_sigset_t *oss; +osf1_cvt_sigset_from_native(const sigset_t *bss, osf1_sigset_t *oss) { int i, newsig; @@ -547,9 +533,7 @@ osf1_cvt_sigset_from_native(bss, oss) } int -osf1_cvt_sigset_to_native(oss, bss) - const osf1_sigset_t *oss; - sigset_t *bss; +osf1_cvt_sigset_to_native(const osf1_sigset_t *oss, sigset_t *bss) { int i, newsig; @@ -568,9 +552,7 @@ osf1_cvt_sigset_to_native(oss, bss) * Convert from a stat structure to an osf1 stat structure. */ void -osf1_cvt_stat_from_native(st, ost) - const struct stat *st; - struct osf1_stat *ost; +osf1_cvt_stat_from_native(const struct stat *st, struct osf1_stat *ost) { ost->st_dev = osf1_cvt_dev_from_native(st->st_dev); @@ -597,9 +579,7 @@ osf1_cvt_stat_from_native(st, ost) * Convert from a stat structure to an osf1 stat structure. */ void -osf1_cvt_stat2_from_native(st, ost) - const struct stat *st; - struct osf1_stat2 *ost; +osf1_cvt_stat2_from_native(const struct stat *st, struct osf1_stat2 *ost) { memset(ost, 0, sizeof *ost); @@ -621,9 +601,7 @@ osf1_cvt_stat2_from_native(st, ost) } void -osf1_cvt_statfs_from_native(bsfs, osfs) - const struct statvfs *bsfs; - struct osf1_statfs *osfs; +osf1_cvt_statfs_from_native(const struct statvfs *bsfs, struct osf1_statfs *osfs) { memset(osfs, 0, sizeof (struct osf1_statfs)); diff --git a/sys/compat/osf1/osf1_descrip.c b/sys/compat/osf1/osf1_descrip.c index 9401877182f..ec5a6c1fd48 100644 --- a/sys/compat/osf1/osf1_descrip.c +++ b/sys/compat/osf1/osf1_descrip.c @@ -1,4 +1,4 @@ -/* $NetBSD: osf1_descrip.c,v 1.23 2007/06/02 10:09:05 dsl Exp $ */ +/* $NetBSD: osf1_descrip.c,v 1.24 2007/12/08 18:36:20 dsl Exp $ */ /* * Copyright (c) 1999 Christopher G. Demetriou. All rights reserved. @@ -58,7 +58,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: osf1_descrip.c,v 1.23 2007/06/02 10:09:05 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: osf1_descrip.c,v 1.24 2007/12/08 18:36:20 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -87,10 +87,7 @@ __KERNEL_RCSID(0, "$NetBSD: osf1_descrip.c,v 1.23 2007/06/02 10:09:05 dsl Exp $" #include <compat/osf1/osf1_cvt.h> int -osf1_sys_fcntl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_fcntl(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_fcntl_args *uap = v; struct sys_fcntl_args a; @@ -198,10 +195,7 @@ osf1_sys_fcntl(l, v, retval) } int -osf1_sys_fpathconf(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_fpathconf(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_fpathconf_args *uap = v; struct sys_fpathconf_args a; @@ -222,10 +216,7 @@ osf1_sys_fpathconf(l, v, retval) * Return status information about a file descriptor. */ int -osf1_sys_fstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_fstat(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_fstat_args *uap = v; struct proc *p = l->l_proc; @@ -254,10 +245,7 @@ osf1_sys_fstat(l, v, retval) * Return status information about a file descriptor. */ int -osf1_sys_fstat2(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_fstat2(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_fstat2_args *uap = v; struct proc *p = l->l_proc; @@ -283,10 +271,7 @@ osf1_sys_fstat2(l, v, retval) } int -osf1_sys_ftruncate(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_ftruncate(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_ftruncate_args *uap = v; struct sys_ftruncate_args a; @@ -299,10 +284,7 @@ osf1_sys_ftruncate(l, v, retval) } int -osf1_sys_lseek(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_lseek(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_lseek_args *uap = v; struct sys_lseek_args a; diff --git a/sys/compat/osf1/osf1_exec_ecoff.c b/sys/compat/osf1/osf1_exec_ecoff.c index c3c8deacfeb..6670b128eb1 100644 --- a/sys/compat/osf1/osf1_exec_ecoff.c +++ b/sys/compat/osf1/osf1_exec_ecoff.c @@ -1,4 +1,4 @@ -/* $NetBSD: osf1_exec_ecoff.c,v 1.18 2007/11/27 11:25:29 dogcow Exp $ */ +/* $NetBSD: osf1_exec_ecoff.c,v 1.19 2007/12/08 18:36:20 dsl Exp $ */ /* * Copyright (c) 1999 Christopher G. Demetriou. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: osf1_exec_ecoff.c,v 1.18 2007/11/27 11:25:29 dogcow Exp $"); +__KERNEL_RCSID(0, "$NetBSD: osf1_exec_ecoff.c,v 1.19 2007/12/08 18:36:20 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -118,12 +118,7 @@ osf1_exec_ecoff_probe(struct lwp *l, struct exec_package *epp) * any ELF-like AUX entries used by the dynamic loading scheme. */ int -osf1_copyargs(l, pack, arginfo, stackp, argp) - struct lwp *l; - struct exec_package *pack; - struct ps_strings *arginfo; - char **stackp; - void *argp; +osf1_copyargs(struct lwp *l, struct exec_package *pack, struct ps_strings *arginfo, char **stackp, void *argp) { struct osf1_exec_emul_arg *emul_arg = pack->ep_emul_arg; struct osf1_auxv ai[OSF1_MAX_AUX_ENTRIES], *a; diff --git a/sys/compat/osf1/osf1_file.c b/sys/compat/osf1/osf1_file.c index 64aca708a50..efe124c7e8a 100644 --- a/sys/compat/osf1/osf1_file.c +++ b/sys/compat/osf1/osf1_file.c @@ -1,4 +1,4 @@ -/* $NetBSD: osf1_file.c,v 1.27 2007/05/12 17:28:20 dsl Exp $ */ +/* $NetBSD: osf1_file.c,v 1.28 2007/12/08 18:36:20 dsl Exp $ */ /* * Copyright (c) 1999 Christopher G. Demetriou. All rights reserved. @@ -58,7 +58,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: osf1_file.c,v 1.27 2007/05/12 17:28:20 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: osf1_file.c,v 1.28 2007/12/08 18:36:20 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_syscall_debug.h" @@ -93,10 +93,7 @@ __KERNEL_RCSID(0, "$NetBSD: osf1_file.c,v 1.27 2007/05/12 17:28:20 dsl Exp $"); #include <compat/osf1/osf1_cvt.h> int -osf1_sys_access(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_access(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_access_args *uap = v; struct sys_access_args a; @@ -114,10 +111,7 @@ osf1_sys_access(l, v, retval) } int -osf1_sys_execve(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_execve(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_execve_args *uap = v; struct sys_execve_args ap; @@ -134,10 +128,7 @@ osf1_sys_execve(l, v, retval) */ /* ARGSUSED */ int -osf1_sys_lstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_lstat(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_lstat_args *uap = v; struct stat sb; @@ -157,10 +148,7 @@ osf1_sys_lstat(l, v, retval) */ /* ARGSUSED */ int -osf1_sys_lstat2(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_lstat2(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_lstat2_args *uap = v; struct stat sb; @@ -176,10 +164,7 @@ osf1_sys_lstat2(l, v, retval) } int -osf1_sys_mknod(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_mknod(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_mknod_args *uap = v; struct sys_mknod_args a; @@ -192,10 +177,7 @@ osf1_sys_mknod(l, v, retval) } int -osf1_sys_open(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_open(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_open_args *uap = v; struct sys_open_args a; @@ -226,10 +208,7 @@ osf1_sys_open(l, v, retval) } int -osf1_sys_pathconf(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_pathconf(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_pathconf_args *uap = v; struct sys_pathconf_args a; @@ -251,10 +230,7 @@ osf1_sys_pathconf(l, v, retval) */ /* ARGSUSED */ int -osf1_sys_stat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_stat(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_stat_args *uap = v; struct stat sb; @@ -274,10 +250,7 @@ osf1_sys_stat(l, v, retval) */ /* ARGSUSED */ int -osf1_sys_stat2(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_stat2(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_stat2_args *uap = v; struct stat sb; @@ -293,10 +266,7 @@ osf1_sys_stat2(l, v, retval) } int -osf1_sys_truncate(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_truncate(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_truncate_args *uap = v; struct sys_truncate_args a; @@ -309,10 +279,7 @@ osf1_sys_truncate(l, v, retval) } int -osf1_sys_utimes(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_utimes(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_utimes_args *uap = v; struct osf1_timeval otv; diff --git a/sys/compat/osf1/osf1_ioctl.c b/sys/compat/osf1/osf1_ioctl.c index 3783e3c480e..5c4a9fa82fb 100644 --- a/sys/compat/osf1/osf1_ioctl.c +++ b/sys/compat/osf1/osf1_ioctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: osf1_ioctl.c,v 1.20 2007/12/04 18:40:20 dsl Exp $ */ +/* $NetBSD: osf1_ioctl.c,v 1.21 2007/12/08 18:36:21 dsl Exp $ */ /* * Copyright (c) 1999 Christopher G. Demetriou. All rights reserved. @@ -58,7 +58,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: osf1_ioctl.c,v 1.20 2007/12/04 18:40:20 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: osf1_ioctl.c,v 1.21 2007/12/08 18:36:21 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_43.h" @@ -87,10 +87,7 @@ static int osf1_ioctl_t(struct lwp *l, struct sys_ioctl_args *nuap, register_t *retval, int cmd, int dir, int len); int -osf1_sys_ioctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_ioctl(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_ioctl_args *uap = v; struct sys_ioctl_args a; @@ -157,13 +154,7 @@ osf1_sys_ioctl(l, v, retval) } static int -osf1_ioctl_f(l, uap, retval, cmd, dir, len) - struct lwp *l; - struct sys_ioctl_args *uap; - register_t *retval; - int cmd; - int dir; - int len; +osf1_ioctl_f(struct lwp *l, struct sys_ioctl_args *uap, register_t *retval, int cmd, int dir, int len) { switch (cmd) { @@ -185,13 +176,7 @@ osf1_ioctl_f(l, uap, retval, cmd, dir, len) } static int -osf1_ioctl_i(l, uap, retval, cmd, dir, len) - struct lwp *l; - struct sys_ioctl_args *uap; - register_t *retval; - int cmd; - int dir; - int len; +osf1_ioctl_i(struct lwp *l, struct sys_ioctl_args *uap, register_t *retval, int cmd, int dir, int len) { switch (cmd) { @@ -219,13 +204,7 @@ osf1_ioctl_i(l, uap, retval, cmd, dir, len) } static int -osf1_ioctl_t(l, uap, retval, cmd, dir, len) - struct lwp *l; - struct sys_ioctl_args *uap; - register_t *retval; - int cmd; - int dir; - int len; +osf1_ioctl_t(struct lwp *l, struct sys_ioctl_args *uap, register_t *retval, int cmd, int dir, int len) { switch (cmd) { diff --git a/sys/compat/osf1/osf1_misc.c b/sys/compat/osf1/osf1_misc.c index bd0c38db30e..e53e2671d4f 100644 --- a/sys/compat/osf1/osf1_misc.c +++ b/sys/compat/osf1/osf1_misc.c @@ -1,4 +1,4 @@ -/* $NetBSD: osf1_misc.c,v 1.79 2007/06/16 20:04:28 dsl Exp $ */ +/* $NetBSD: osf1_misc.c,v 1.80 2007/12/08 18:36:21 dsl Exp $ */ /* * Copyright (c) 1999 Christopher G. Demetriou. All rights reserved. @@ -58,7 +58,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: osf1_misc.c,v 1.79 2007/06/16 20:04:28 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: osf1_misc.c,v 1.80 2007/12/08 18:36:21 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_syscall_debug.h" @@ -102,10 +102,7 @@ extern int scdebug; #endif int -osf1_sys_classcntl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_classcntl(struct lwp *l, void *v, register_t *retval) { /* XXX */ @@ -113,10 +110,7 @@ osf1_sys_classcntl(l, v, retval) } int -osf1_sys_reboot(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_reboot(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_reboot_args *uap = v; struct sys_reboot_args a; @@ -134,10 +128,7 @@ osf1_sys_reboot(l, v, retval) } int -osf1_sys_set_program_attributes(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_set_program_attributes(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_set_program_attributes_args *uap = v; struct proc *p = l->l_proc; @@ -251,10 +242,7 @@ osf1_sys_getsysinfo(struct lwp *l, void *v, register_t *retval) } int -osf1_sys_setsysinfo(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_setsysinfo(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_setsysinfo_args *uap = v; u_int64_t temp; @@ -280,10 +268,7 @@ osf1_sys_setsysinfo(l, v, retval) } int -osf1_sys_sysinfo(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_sysinfo(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_sysinfo_args *uap = v; const char *string; @@ -357,10 +342,7 @@ dont_care: } int -osf1_sys_uname(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_uname(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_uname_args *uap = v; struct osf1_utsname u; @@ -386,10 +368,7 @@ osf1_sys_uname(l, v, retval) } int -osf1_sys_usleep_thread(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_usleep_thread(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_usleep_thread_args *uap = v; struct osf1_timeval otv, endotv; @@ -424,10 +403,7 @@ osf1_sys_usleep_thread(l, v, retval) } int -osf1_sys_wait4(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_wait4(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_wait4_args *uap = v; struct osf1_rusage osf1_rusage; diff --git a/sys/compat/osf1/osf1_mmap.c b/sys/compat/osf1/osf1_mmap.c index 8eb66cf70ff..3313a329497 100644 --- a/sys/compat/osf1/osf1_mmap.c +++ b/sys/compat/osf1/osf1_mmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: osf1_mmap.c,v 1.11 2007/02/09 21:55:23 ad Exp $ */ +/* $NetBSD: osf1_mmap.c,v 1.12 2007/12/08 18:36:21 dsl Exp $ */ /* * Copyright (c) 1999 Christopher G. Demetriou. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: osf1_mmap.c,v 1.11 2007/02/09 21:55:23 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: osf1_mmap.c,v 1.12 2007/12/08 18:36:21 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -46,10 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: osf1_mmap.c,v 1.11 2007/02/09 21:55:23 ad Exp $"); #include <compat/osf1/osf1_cvt.h> int -osf1_sys_madvise(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_madvise(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_madvise_args *uap = v; struct sys_madvise_args a; @@ -112,10 +109,7 @@ osf1_sys_madvise(l, v, retval) } int -osf1_sys_mmap(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_mmap(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_mmap_args *uap = v; struct proc *p = l->l_proc; @@ -209,10 +203,7 @@ done: } int -osf1_sys_mprotect(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_mprotect(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_mprotect_args *uap = v; struct sys_mprotect_args a; diff --git a/sys/compat/osf1/osf1_mount.c b/sys/compat/osf1/osf1_mount.c index b6c473e1ad1..3b6831de0fc 100644 --- a/sys/compat/osf1/osf1_mount.c +++ b/sys/compat/osf1/osf1_mount.c @@ -1,4 +1,4 @@ -/* $NetBSD: osf1_mount.c,v 1.36 2007/11/27 09:47:16 dogcow Exp $ */ +/* $NetBSD: osf1_mount.c,v 1.37 2007/12/08 18:36:21 dsl Exp $ */ /* * Copyright (c) 1999 Christopher G. Demetriou. All rights reserved. @@ -58,7 +58,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: osf1_mount.c,v 1.36 2007/11/27 09:47:16 dogcow Exp $"); +__KERNEL_RCSID(0, "$NetBSD: osf1_mount.c,v 1.37 2007/12/08 18:36:21 dsl Exp $"); #if defined(_KERNEL_OPT) #include "fs_nfs.h" @@ -109,10 +109,7 @@ static int osf1_mount_mfs(struct lwp *, struct osf1_sys_mount_args *); static int osf1_mount_nfs(struct lwp *, struct osf1_sys_mount_args *); int -osf1_sys_fstatfs(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_fstatfs(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_fstatfs_args *uap = v; struct proc *p = l->l_proc; @@ -139,10 +136,7 @@ osf1_sys_fstatfs(l, v, retval) } int -osf1_sys_getfsstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_getfsstat(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_getfsstat_args *uap = v; struct mount *mp, *nmp; @@ -187,10 +181,7 @@ osf1_sys_getfsstat(l, v, retval) } int -osf1_sys_mount(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_mount(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_mount_args *uap = v; @@ -213,10 +204,7 @@ osf1_sys_mount(l, v, retval) } int -osf1_sys_statfs(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_statfs(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_statfs_args *uap = v; struct mount *mp; @@ -240,10 +228,7 @@ osf1_sys_statfs(l, v, retval) } int -osf1_sys_unmount(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_unmount(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_unmount_args *uap = v; struct sys_unmount_args a; diff --git a/sys/compat/osf1/osf1_prot.c b/sys/compat/osf1/osf1_prot.c index b1aafde20fc..7885e20288c 100644 --- a/sys/compat/osf1/osf1_prot.c +++ b/sys/compat/osf1/osf1_prot.c @@ -1,4 +1,4 @@ -/* $NetBSD: osf1_prot.c,v 1.11 2007/06/23 09:09:56 dsl Exp $ */ +/* $NetBSD: osf1_prot.c,v 1.12 2007/12/08 18:36:21 dsl Exp $ */ /* * Copyright (c) 1999 Christopher G. Demetriou. All rights reserved. @@ -58,7 +58,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: osf1_prot.c,v 1.11 2007/06/23 09:09:56 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: osf1_prot.c,v 1.12 2007/12/08 18:36:21 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -79,10 +79,7 @@ __KERNEL_RCSID(0, "$NetBSD: osf1_prot.c,v 1.11 2007/06/23 09:09:56 dsl Exp $"); * setuid(), you'll get a correct description of setgid(). */ int -osf1_sys_setgid(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_setgid(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_setgid_args *uap = v; gid_t gid = SCARG(uap, gid); @@ -109,10 +106,7 @@ osf1_sys_setgid(l, v, retval) * this function call. */ int -osf1_sys_setuid(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_setuid(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_setuid_args *uap = v; uid_t uid = SCARG(uap, uid); diff --git a/sys/compat/osf1/osf1_resource.c b/sys/compat/osf1/osf1_resource.c index 1b7ff84fd7a..25a636f4d35 100644 --- a/sys/compat/osf1/osf1_resource.c +++ b/sys/compat/osf1/osf1_resource.c @@ -1,4 +1,4 @@ -/* $NetBSD: osf1_resource.c,v 1.9 2007/05/12 18:10:20 dsl Exp $ */ +/* $NetBSD: osf1_resource.c,v 1.10 2007/12/08 18:36:21 dsl Exp $ */ /* * Copyright (c) 1999 Christopher G. Demetriou. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: osf1_resource.c,v 1.9 2007/05/12 18:10:20 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: osf1_resource.c,v 1.10 2007/12/08 18:36:21 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -46,10 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: osf1_resource.c,v 1.9 2007/05/12 18:10:20 dsl Exp $" #include <compat/osf1/osf1_cvt.h> int -osf1_sys_getrlimit(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_getrlimit(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_getrlimit_args *uap = v; struct sys_getrlimit_args a; @@ -88,10 +85,7 @@ osf1_sys_getrlimit(l, v, retval) } int -osf1_sys_getrusage(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_getrusage(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_getrusage_args *uap = v; struct osf1_rusage osf1_rusage; @@ -122,10 +116,7 @@ osf1_sys_getrusage(l, v, retval) } int -osf1_sys_setrlimit(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_setrlimit(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_setrlimit_args *uap = v; struct sys_setrlimit_args a; diff --git a/sys/compat/osf1/osf1_signal.c b/sys/compat/osf1/osf1_signal.c index c9b3c9c8128..0a07516b034 100644 --- a/sys/compat/osf1/osf1_signal.c +++ b/sys/compat/osf1/osf1_signal.c @@ -1,4 +1,4 @@ -/* $NetBSD: osf1_signal.c,v 1.32 2007/06/16 20:04:28 dsl Exp $ */ +/* $NetBSD: osf1_signal.c,v 1.33 2007/12/08 18:36:21 dsl Exp $ */ /* * Copyright (c) 1999 Christopher G. Demetriou. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: osf1_signal.c,v 1.32 2007/06/16 20:04:28 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: osf1_signal.c,v 1.33 2007/12/08 18:36:21 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -56,10 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: osf1_signal.c,v 1.32 2007/06/16 20:04:28 dsl Exp $") #if 0 int -osf1_sys_kill(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_kill(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_kill_args *uap = v; struct sys_kill_args ka; @@ -73,10 +70,7 @@ osf1_sys_kill(l, v, retval) #endif int -osf1_sys_sigaction(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_sigaction(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_sigaction_args *uap = v; struct osf1_sigaction *nosa, *oosa, tmposa; @@ -111,10 +105,7 @@ osf1_sys_sigaction(l, v, retval) } int -osf1_sys_sigaltstack(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_sigaltstack(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_sigaltstack_args *uap = v; /* We silently ignore OSF1_SS_NOMASK and OSF1_SS_UCONTEXT */ @@ -124,10 +115,7 @@ osf1_sys_sigaltstack(l, v, retval) #if 0 int -osf1_sys_signal(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_signal(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_signal_args *uap = v; struct proc *p = l->l_proc; @@ -230,10 +218,7 @@ osf1_sys_signal(l, v, retval) } int -osf1_sys_sigpending(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_sigpending(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_sigpending_args *uap = v; struct proc *p = l->l_proc; @@ -247,10 +232,7 @@ osf1_sys_sigpending(l, v, retval) } int -osf1_sys_sigprocmask(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_sigprocmask(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_sigprocmask_args *uap = v; struct proc *p = l->l_proc; @@ -306,10 +288,7 @@ osf1_sys_sigprocmask(l, v, retval) } int -osf1_sys_sigsuspend(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_sigsuspend(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_sigsuspend_args *uap = v; osf1_sigset_t oss; diff --git a/sys/compat/osf1/osf1_socket.c b/sys/compat/osf1/osf1_socket.c index 3f9dd8da0ca..b2a291403e3 100644 --- a/sys/compat/osf1/osf1_socket.c +++ b/sys/compat/osf1/osf1_socket.c @@ -1,4 +1,4 @@ -/* $NetBSD: osf1_socket.c,v 1.17 2007/06/30 15:31:50 dsl Exp $ */ +/* $NetBSD: osf1_socket.c,v 1.18 2007/12/08 18:36:22 dsl Exp $ */ /* * Copyright (c) 1999 Christopher G. Demetriou. All rights reserved. @@ -58,7 +58,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: osf1_socket.c,v 1.17 2007/06/30 15:31:50 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: osf1_socket.c,v 1.18 2007/12/08 18:36:22 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -78,10 +78,7 @@ __KERNEL_RCSID(0, "$NetBSD: osf1_socket.c,v 1.17 2007/06/30 15:31:50 dsl Exp $") #include <compat/osf1/osf1_cvt.h> int -osf1_sys_recvmsg_xopen(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_recvmsg_xopen(struct lwp *l, void *v, register_t *retval) { /* XXX */ @@ -89,10 +86,7 @@ osf1_sys_recvmsg_xopen(l, v, retval) } int -osf1_sys_sendmsg_xopen(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_sendmsg_xopen(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_sendmsg_xopen_args *uap = v; struct osf1_msghdr_xopen osf_msghdr; @@ -149,10 +143,7 @@ printf("sendmsg flags leftover: 0x%lx\n", leftovers); } int -osf1_sys_sendto(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_sendto(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_sendto_args *uap = v; struct sys_sendto_args a; @@ -174,10 +165,7 @@ osf1_sys_sendto(l, v, retval) } int -osf1_sys_socket(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_socket(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_socket_args *uap = v; struct compat_30_sys_socket_args a; @@ -195,10 +183,7 @@ osf1_sys_socket(l, v, retval) } int -osf1_sys_socketpair(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_socketpair(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_socketpair_args *uap = v; struct sys_socketpair_args a; diff --git a/sys/compat/osf1/osf1_sysv_ipc.c b/sys/compat/osf1/osf1_sysv_ipc.c index 6b6d054af50..3d6ba8a019f 100644 --- a/sys/compat/osf1/osf1_sysv_ipc.c +++ b/sys/compat/osf1/osf1_sysv_ipc.c @@ -1,4 +1,4 @@ -/* $NetBSD: osf1_sysv_ipc.c,v 1.5 2007/02/09 21:55:23 ad Exp $ */ +/* $NetBSD: osf1_sysv_ipc.c,v 1.6 2007/12/08 18:36:22 dsl Exp $ */ /* * Copyright (c) 1999 Christopher G. Demetriou. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: osf1_sysv_ipc.c,v 1.5 2007/02/09 21:55:23 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: osf1_sysv_ipc.c,v 1.6 2007/12/08 18:36:22 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -46,10 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: osf1_sysv_ipc.c,v 1.5 2007/02/09 21:55:23 ad Exp $") #include <compat/osf1/osf1_cvt.h> int -osf1_sys_shmat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_shmat(struct lwp *l, void *v, register_t *retval) { /* XXX */ @@ -57,10 +54,7 @@ osf1_sys_shmat(l, v, retval) } int -osf1_sys_shmctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_shmctl(struct lwp *l, void *v, register_t *retval) { /* XXX */ @@ -68,10 +62,7 @@ osf1_sys_shmctl(l, v, retval) } int -osf1_sys_shmdt(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_shmdt(struct lwp *l, void *v, register_t *retval) { /* XXX */ @@ -79,10 +70,7 @@ osf1_sys_shmdt(l, v, retval) } int -osf1_sys_shmget(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_shmget(struct lwp *l, void *v, register_t *retval) { /* XXX */ diff --git a/sys/compat/osf1/osf1_time.c b/sys/compat/osf1/osf1_time.c index 961c75efa5a..77c50c9c344 100644 --- a/sys/compat/osf1/osf1_time.c +++ b/sys/compat/osf1/osf1_time.c @@ -1,4 +1,4 @@ -/* $NetBSD: osf1_time.c,v 1.14 2007/05/13 14:47:54 dsl Exp $ */ +/* $NetBSD: osf1_time.c,v 1.15 2007/12/08 18:36:22 dsl Exp $ */ /* * Copyright (c) 1999 Christopher G. Demetriou. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: osf1_time.c,v 1.14 2007/05/13 14:47:54 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: osf1_time.c,v 1.15 2007/12/08 18:36:22 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -46,10 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: osf1_time.c,v 1.14 2007/05/13 14:47:54 dsl Exp $"); #include <compat/osf1/osf1_cvt.h> int -osf1_sys_gettimeofday(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_gettimeofday(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_gettimeofday_args *uap = v; struct osf1_timeval otv; @@ -71,10 +68,7 @@ osf1_sys_gettimeofday(l, v, retval) } int -osf1_sys_setitimer(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_setitimer(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_setitimer_args *uap = v; struct osf1_itimerval o_itv, o_oitv; @@ -133,10 +127,7 @@ osf1_sys_setitimer(l, v, retval) } int -osf1_sys_getitimer(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_getitimer(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_getitimer_args *uap = v; struct osf1_itimerval o_oitv; @@ -172,10 +163,7 @@ osf1_sys_getitimer(l, v, retval) } int -osf1_sys_settimeofday(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +osf1_sys_settimeofday(struct lwp *l, void *v, register_t *retval) { struct osf1_sys_settimeofday_args *uap = v; struct osf1_timeval otv; diff --git a/sys/compat/ossaudio/ossaudio.c b/sys/compat/ossaudio/ossaudio.c index 5f2d64d115d..bf6691d1b0f 100644 --- a/sys/compat/ossaudio/ossaudio.c +++ b/sys/compat/ossaudio/ossaudio.c @@ -1,4 +1,4 @@ -/* $NetBSD: ossaudio.c,v 1.59 2007/12/04 18:40:20 dsl Exp $ */ +/* $NetBSD: ossaudio.c,v 1.60 2007/12/08 18:36:22 dsl Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ossaudio.c,v 1.59 2007/12/04 18:40:20 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ossaudio.c,v 1.60 2007/12/08 18:36:22 dsl Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -607,9 +607,7 @@ enum_to_mask(struct audiodevinfo *di, int enm) * to collect the information. */ static struct audiodevinfo * -getdevinfo(fp, l) - struct file *fp; - struct lwp *l; +getdevinfo(struct file *fp, struct lwp *l) { mixer_devinfo_t mi; int i, j, e; @@ -1163,10 +1161,7 @@ oss_ioctl_sequencer(l, uap, retval) * If not, set it to be. */ static void -setblocksize(fp, info, l) - struct file *fp; - struct audio_info *info; - struct lwp *l; +setblocksize(struct file *fp, struct audio_info *info, struct lwp *l) { struct audio_info set; int s; diff --git a/sys/compat/pecoff/pecoff_exec.c b/sys/compat/pecoff/pecoff_exec.c index 2ff8c70ecbf..409fda20f95 100644 --- a/sys/compat/pecoff/pecoff_exec.c +++ b/sys/compat/pecoff/pecoff_exec.c @@ -1,4 +1,4 @@ -/* $NetBSD: pecoff_exec.c,v 1.37 2007/11/26 19:01:33 pooka Exp $ */ +/* $NetBSD: pecoff_exec.c,v 1.38 2007/12/08 18:36:22 dsl Exp $ */ /* * Copyright (c) 2000 Masaru OKI @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pecoff_exec.c,v 1.37 2007/11/26 19:01:33 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pecoff_exec.c,v 1.38 2007/12/08 18:36:22 dsl Exp $"); /*#define DEBUG_PECOFF*/ @@ -82,12 +82,7 @@ int exec_pecoff_prep_zmagic (struct lwp *l, struct exec_package *epp, int -pecoff_copyargs(l, pack, arginfo, stackp, argp) - struct lwp *l; - struct exec_package *pack; - struct ps_strings *arginfo; - char **stackp; - void *argp; +pecoff_copyargs(struct lwp *l, struct exec_package *pack, struct ps_strings *arginfo, char **stackp, void *argp) { int len = sizeof(struct pecoff_args); struct pecoff_args *ap; @@ -116,10 +111,7 @@ static const char signature[] = PECOFF_SIGNATURE; * Check PE signature. */ int -pecoff_signature(l, vp, dp) - struct lwp *l; - struct vnode *vp; - struct pecoff_dos_filehdr *dp; +pecoff_signature(struct lwp *l, struct vnode *vp, struct pecoff_dos_filehdr *dp) { int error; char tbuf[sizeof(signature) - 1]; @@ -141,13 +133,7 @@ pecoff_signature(l, vp, dp) * load(mmap) file. for dynamic linker (ld.so.dll) */ int -pecoff_load_file(l, epp, path, vcset, entry, argp) - struct lwp *l; - struct exec_package *epp; - const char *path; - struct exec_vmcmd_set *vcset; - u_long *entry; - struct pecoff_args *argp; +pecoff_load_file(struct lwp *l, struct exec_package *epp, const char *path, struct exec_vmcmd_set *vcset, u_long *entry, struct pecoff_args *argp) { int error, peofs, scnsiz, i; struct vnode *vp; @@ -270,13 +256,7 @@ bad: * mmap one section. */ void -pecoff_load_section(vcset, vp, sh, addr, size, prot) - struct exec_vmcmd_set *vcset; - struct vnode *vp; - struct coff_scnhdr *sh; - long *addr; - u_long *size; - int *prot; +pecoff_load_section(struct exec_vmcmd_set *vcset, struct vnode *vp, struct coff_scnhdr *sh, long *addr, u_long *size, int *prot) { u_long diff, offset; @@ -314,9 +294,7 @@ pecoff_load_section(vcset, vp, sh, addr, size, prot) /* */ int -exec_pecoff_makecmds(l, epp) - struct lwp *l; - struct exec_package *epp; +exec_pecoff_makecmds(struct lwp *l, struct exec_package *epp) { int error, peofs; struct pecoff_dos_filehdr *dp = epp->ep_hdr; @@ -358,11 +336,7 @@ exec_pecoff_makecmds(l, epp) /* */ int -exec_pecoff_coff_makecmds(l, epp, fp, peofs) - struct lwp *l; - struct exec_package *epp; - struct coff_filehdr *fp; - int peofs; +exec_pecoff_coff_makecmds(struct lwp *l, struct exec_package *epp, struct coff_filehdr *fp, int peofs) { struct coff_aouthdr *ap; struct proc *p; @@ -413,12 +387,7 @@ exec_pecoff_prep_nmagic(struct proc *p, /* */ int -exec_pecoff_prep_zmagic(l, epp, fp, ap, peofs) - struct lwp *l; - struct exec_package *epp; - struct coff_filehdr *fp; - struct coff_aouthdr *ap; - int peofs; +exec_pecoff_prep_zmagic(struct lwp *l, struct exec_package *epp, struct coff_filehdr *fp, struct coff_aouthdr *ap, int peofs) { int error, i; struct pecoff_opthdr *wp; diff --git a/sys/compat/sunos/sunos_exec_aout.c b/sys/compat/sunos/sunos_exec_aout.c index d5c5ae692f9..082d1fdf2af 100644 --- a/sys/compat/sunos/sunos_exec_aout.c +++ b/sys/compat/sunos/sunos_exec_aout.c @@ -1,4 +1,4 @@ -/* $NetBSD: sunos_exec_aout.c,v 1.16 2007/12/04 18:40:21 dsl Exp $ */ +/* $NetBSD: sunos_exec_aout.c,v 1.17 2007/12/08 18:36:23 dsl Exp $ */ /* * Copyright (c) 1993 Theo de Raadt @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sunos_exec_aout.c,v 1.16 2007/12/04 18:40:21 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunos_exec_aout.c,v 1.17 2007/12/08 18:36:23 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -65,9 +65,7 @@ int sunos_exec_aout_prep_nmagic(struct lwp *, struct exec_package *); int sunos_exec_aout_prep_omagic(struct lwp *, struct exec_package *); int -exec_sunos_aout_makecmds(l, epp) - struct lwp *l; - struct exec_package *epp; +exec_sunos_aout_makecmds(struct lwp *l, struct exec_package *epp) { struct sunos_exec *sunmag = epp->ep_hdr; int error = ENOEXEC; @@ -115,9 +113,7 @@ exec_sunos_aout_makecmds(l, epp) * text, data, bss, and stack segments. */ int -sunos_exec_aout_prep_zmagic(l, epp) - struct lwp *l; - struct exec_package *epp; +sunos_exec_aout_prep_zmagic(struct lwp *l, struct exec_package *epp) { struct exec *execp = epp->ep_hdr; int error; @@ -155,9 +151,7 @@ sunos_exec_aout_prep_zmagic(l, epp) * sunos_exec_aout_prep_nmagic(): Prepare a SunOS NMAGIC binary's exec package */ int -sunos_exec_aout_prep_nmagic(l, epp) - struct lwp *l; - struct exec_package *epp; +sunos_exec_aout_prep_nmagic(struct lwp *l, struct exec_package *epp) { struct exec *execp = epp->ep_hdr; long bsize, baddr; @@ -192,9 +186,7 @@ sunos_exec_aout_prep_nmagic(l, epp) * sunos_exec_aout_prep_omagic(): Prepare a SunOS OMAGIC binary's exec package */ int -sunos_exec_aout_prep_omagic(l, epp) - struct lwp *l; - struct exec_package *epp; +sunos_exec_aout_prep_omagic(struct lwp *l, struct exec_package *epp) { struct exec *execp = epp->ep_hdr; long bsize, baddr; diff --git a/sys/compat/sunos/sunos_ioctl.c b/sys/compat/sunos/sunos_ioctl.c index 9ded5b5a8c1..0b8a063776a 100644 --- a/sys/compat/sunos/sunos_ioctl.c +++ b/sys/compat/sunos/sunos_ioctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: sunos_ioctl.c,v 1.57 2007/12/04 18:40:21 dsl Exp $ */ +/* $NetBSD: sunos_ioctl.c,v 1.58 2007/12/08 18:36:23 dsl Exp $ */ /* * Copyright (c) 1993 Markus Wild. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sunos_ioctl.c,v 1.57 2007/12/04 18:40:21 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunos_ioctl.c,v 1.58 2007/12/08 18:36:23 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_execfmt.h" @@ -127,9 +127,7 @@ static void stio2stios(struct sunos_termio *, struct sunos_termios *); */ static void -stios2btios(st, bt) - struct sunos_termios *st; - struct termios *bt; +stios2btios(struct sunos_termios *st, struct termios *bt) { u_long l, r; @@ -249,9 +247,7 @@ stios2btios(st, bt) static void -btios2stios(bt, st) - struct termios *bt; - struct sunos_termios *st; +btios2stios(struct termios *bt, struct sunos_termios *st) { u_long l, r; int s; @@ -378,9 +374,7 @@ btios2stios(bt, st) } static void -stios2stio(ts, t) - struct sunos_termios *ts; - struct sunos_termio *t; +stios2stio(struct sunos_termios *ts, struct sunos_termio *t) { t->c_iflag = ts->c_iflag; t->c_oflag = ts->c_oflag; @@ -391,9 +385,7 @@ stios2stio(ts, t) } static void -stio2stios(t, ts) - struct sunos_termio *t; - struct sunos_termios *ts; +stio2stios(struct sunos_termio *t, struct sunos_termios *ts) { ts->c_iflag = t->c_iflag; ts->c_oflag = t->c_oflag; @@ -404,10 +396,7 @@ stio2stios(t, ts) } int -sunos_sys_ioctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_ioctl(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_ioctl_args /* { int fd; @@ -943,9 +932,7 @@ static void sunos_to_bsd_flock(struct sunos_flock *, struct flock *); #define SUNOS_F_UNLCK 3 static void -bsd_to_sunos_flock(iflp, oflp) - struct flock *iflp; - struct sunos_flock *oflp; +bsd_to_sunos_flock(struct flock *iflp, struct sunos_flock *oflp) { switch (iflp->l_type) { case F_RDLCK: @@ -971,9 +958,7 @@ bsd_to_sunos_flock(iflp, oflp) static void -sunos_to_bsd_flock(iflp, oflp) - struct sunos_flock *iflp; - struct flock *oflp; +sunos_to_bsd_flock(struct sunos_flock *iflp, struct flock *oflp) { switch (iflp->l_type) { case SUNOS_F_RDLCK: @@ -1018,10 +1003,7 @@ static struct { }; int -sunos_sys_fcntl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_fcntl(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_fcntl_args *uap = v; long flg; diff --git a/sys/compat/sunos/sunos_misc.c b/sys/compat/sunos/sunos_misc.c index e0ca24d0a7c..d3bac27d442 100644 --- a/sys/compat/sunos/sunos_misc.c +++ b/sys/compat/sunos/sunos_misc.c @@ -1,4 +1,4 @@ -/* $NetBSD: sunos_misc.c,v 1.154 2007/12/04 18:40:21 dsl Exp $ */ +/* $NetBSD: sunos_misc.c,v 1.155 2007/12/08 18:36:23 dsl Exp $ */ /* * Copyright (c) 1992, 1993 @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sunos_misc.c,v 1.154 2007/12/04 18:40:21 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunos_misc.c,v 1.155 2007/12/08 18:36:23 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_nfsserver.h" @@ -113,10 +113,7 @@ __KERNEL_RCSID(0, "$NetBSD: sunos_misc.c,v 1.154 2007/12/04 18:40:21 dsl Exp $") static int sunstatfs(struct statvfs *, void *); int -sunos_sys_stime(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_stime(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_stime_args *uap = v; struct timeval tv; @@ -131,10 +128,7 @@ sunos_sys_stime(l, v, retval) } int -sunos_sys_wait4(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_wait4(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_wait4_args *uap = v; if (SCARG(uap, pid) == 0) @@ -143,10 +137,7 @@ sunos_sys_wait4(l, v, retval) } int -sunos_sys_creat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_creat(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_creat_args *uap = v; struct sys_open_args ouap; @@ -159,10 +150,7 @@ sunos_sys_creat(l, v, retval) } int -sunos_sys_access(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_access(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_lstat_args *uap = v; @@ -170,10 +158,7 @@ sunos_sys_access(l, v, retval) } int -sunos_sys_stat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_stat(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_lstat_args *uap = v; @@ -181,10 +166,7 @@ sunos_sys_stat(l, v, retval) } int -sunos_sys_lstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_lstat(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_lstat_args *uap = v; @@ -192,10 +174,7 @@ sunos_sys_lstat(l, v, retval) } int -sunos_sys_execv(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_execv(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_execv_args /* { syscallarg(const char *) path; @@ -211,10 +190,7 @@ sunos_sys_execv(l, v, retval) } int -sunos_sys_execve(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_execve(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_execve_args /* { syscallarg(const char *) path; @@ -231,10 +207,7 @@ sunos_sys_execve(l, v, retval) } int -sunos_sys_omsync(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_omsync(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_omsync_args *uap = v; struct sys___msync13_args ouap; @@ -247,10 +220,7 @@ sunos_sys_omsync(l, v, retval) } int -sunos_sys_unmount(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_unmount(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_unmount_args *uap = v; struct sys_unmount_args ouap; @@ -286,10 +256,7 @@ static struct { }; int -sunos_sys_mount(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_mount(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_mount_args *uap = v; int oflags = SCARG(uap, flags), nflags, error; @@ -358,10 +325,7 @@ sunos_sys_mount(l, v, retval) #if defined(NFS) int -async_daemon(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +async_daemon(struct lwp *l, void *v, register_t *retval) { struct sys_nfssvc_args ouap; @@ -376,17 +340,13 @@ void native_to_sunos_sigset(const sigset_t *, int *); void sunos_to_native_sigset(const int, sigset_t *); inline void -native_to_sunos_sigset(ss, mask) - const sigset_t *ss; - int *mask; +native_to_sunos_sigset(const sigset_t *ss, int *mask) { *mask = ss->__bits[0]; } inline void -sunos_to_native_sigset(mask, ss) - const int mask; - sigset_t *ss; +sunos_to_native_sigset(const int mask, sigset_t *ss) { ss->__bits[0] = mask; @@ -396,10 +356,7 @@ sunos_to_native_sigset(mask, ss) } int -sunos_sys_sigpending(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_sigpending(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_sigpending_args *uap = v; sigset_t ss; @@ -412,10 +369,7 @@ sunos_sys_sigpending(l, v, retval) } int -sunos_sys_sigsuspend(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_sigsuspend(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_sigsuspend_args /* { syscallarg(int) mask; @@ -436,10 +390,7 @@ sunos_sys_sigsuspend(l, v, retval) * This is quite ugly, but what do you expect from compatibility code? */ int -sunos_sys_getdents(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_getdents(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_getdents_args *uap = v; struct proc *p = l->l_proc; @@ -567,10 +518,7 @@ out: #define SUNOS__MAP_NEW 0x80000000 /* if not, old mmap & cannot handle */ int -sunos_sys_mmap(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_mmap(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_mmap_args *uap = v; struct sys_mmap_args ouap; @@ -602,10 +550,7 @@ sunos_sys_mmap(l, v, retval) #define MC_UNLOCKAS 6 int -sunos_sys_mctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_mctl(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_mctl_args *uap = v; @@ -620,10 +565,7 @@ sunos_sys_mctl(l, v, retval) } int -sunos_sys_setsockopt(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_setsockopt(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_setsockopt_args *uap = v; struct proc *p = l->l_proc; @@ -686,10 +628,7 @@ sunos_sys_setsockopt(l, v, retval) static inline int sunos_sys_socket_common(struct lwp *, register_t *, int type); static inline int -sunos_sys_socket_common(l, retval, type) - struct lwp *l; - register_t *retval; - int type; +sunos_sys_socket_common(struct lwp *l, register_t *retval, int type) { struct socket *so; struct file *fp; @@ -707,10 +646,7 @@ sunos_sys_socket_common(l, retval, type) } int -sunos_sys_socket(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_socket(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_socket_args /* { syscallarg(int) domain; @@ -726,10 +662,7 @@ sunos_sys_socket(l, v, retval) } int -sunos_sys_socketpair(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_socketpair(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_socketpair_args /* { syscallarg(int) domain; @@ -749,19 +682,13 @@ sunos_sys_socketpair(l, v, retval) * XXX: This needs cleaning up. */ int -sunos_sys_auditsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_auditsys(struct lwp *l, void *v, register_t *retval) { return 0; } int -sunos_sys_uname(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_uname(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_uname_args *uap = v; struct sunos_utsname sut; @@ -780,10 +707,7 @@ sunos_sys_uname(l, v, retval) } int -sunos_sys_setpgrp(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_setpgrp(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_setpgrp_args *uap = v; struct proc *p = l->l_proc; @@ -802,10 +726,7 @@ sunos_sys_setpgrp(l, v, retval) } int -sunos_sys_open(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_open(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_open_args *uap = v; struct proc *p = l->l_proc; @@ -846,10 +767,7 @@ sunos_sys_open(l, v, retval) #if defined (NFSSERVER) int -sunos_sys_nfssvc(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_nfssvc(struct lwp *l, void *v, register_t *retval) { #if 0 struct sunos_sys_nfssvc_args *uap = v; @@ -881,10 +799,7 @@ sunos_sys_nfssvc(l, v, retval) #endif /* NFSSERVER */ int -sunos_sys_ustat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_ustat(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_ustat_args *uap = v; struct sunos_ustat us; @@ -903,20 +818,14 @@ sunos_sys_ustat(l, v, retval) } int -sunos_sys_quotactl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_quotactl(struct lwp *l, void *v, register_t *retval) { return EINVAL; } int -sunos_sys_vhangup(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_vhangup(struct lwp *l, void *v, register_t *retval) { struct proc *p = l->l_proc; struct session *sp = p->p_session; @@ -938,9 +847,7 @@ sunos_sys_vhangup(l, v, retval) } static int -sunstatfs(sp, buf) - struct statvfs *sp; - void *buf; +sunstatfs(struct statvfs *sp, void *buf) { struct sunos_statfs ssfs; @@ -957,10 +864,7 @@ sunstatfs(sp, buf) } int -sunos_sys_statfs(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_statfs(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_statfs_args *uap = v; struct mount *mp; @@ -981,10 +885,7 @@ sunos_sys_statfs(l, v, retval) } int -sunos_sys_fstatfs(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_fstatfs(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_fstatfs_args *uap = v; struct proc *p = l->l_proc; @@ -1008,10 +909,7 @@ sunos_sys_fstatfs(l, v, retval) } int -sunos_sys_exportfs(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_exportfs(struct lwp *l, void *v, register_t *retval) { /* * XXX: should perhaps translate into a mount(2) @@ -1021,10 +919,7 @@ sunos_sys_exportfs(l, v, retval) } int -sunos_sys_mknod(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_mknod(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_mknod_args *uap = v; @@ -1044,10 +939,7 @@ sunos_sys_mknod(l, v, retval) #define SUNOS_SC_VERSION 8 int -sunos_sys_sysconf(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_sysconf(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_sysconf_args *uap = v; extern int maxfiles; @@ -1091,10 +983,7 @@ sunos_sys_sysconf(l, v, retval) #define SUNOS_RLIM_NLIMITS 7 int -sunos_sys_getrlimit(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_getrlimit(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_getrlimit_args *uap = v; @@ -1108,10 +997,7 @@ sunos_sys_getrlimit(l, v, retval) } int -sunos_sys_setrlimit(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_setrlimit(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_getrlimit_args *uap = v; @@ -1143,10 +1029,7 @@ static const int nreqs = sizeof(sreq2breq) / sizeof(sreq2breq[0]); #endif /* PTRACE || _LKM */ int -sunos_sys_ptrace(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_ptrace(struct lwp *l, void *v, register_t *retval) { #if defined(PTRACE) || defined(_LKM) struct sunos_sys_ptrace_args *uap = v; @@ -1206,10 +1089,7 @@ static struct sunos_howto_conv { }; int -sunos_sys_reboot(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_reboot(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_reboot_args *uap = v; struct sys_reboot_args ua; @@ -1261,10 +1141,7 @@ sunos_sys_reboot(l, v, retval) */ /* ARGSUSED */ int -sunos_sys_sigvec(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos_sys_sigvec(struct lwp *l, void *v, register_t *retval) { struct sunos_sys_sigvec_args /* { syscallarg(int) signum; diff --git a/sys/compat/sunos32/sunos32_exec_aout.c b/sys/compat/sunos32/sunos32_exec_aout.c index 82e86793698..98e4d2254c6 100644 --- a/sys/compat/sunos32/sunos32_exec_aout.c +++ b/sys/compat/sunos32/sunos32_exec_aout.c @@ -1,4 +1,4 @@ -/* $NetBSD: sunos32_exec_aout.c,v 1.9 2007/03/16 22:21:42 dsl Exp $ */ +/* $NetBSD: sunos32_exec_aout.c,v 1.10 2007/12/08 18:36:23 dsl Exp $ */ /* * Copyright (c) 2001 Matthew R. Green @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sunos32_exec_aout.c,v 1.9 2007/03/16 22:21:42 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunos32_exec_aout.c,v 1.10 2007/12/08 18:36:23 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_execfmt.h" @@ -51,9 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: sunos32_exec_aout.c,v 1.9 2007/03/16 22:21:42 dsl Ex #include <compat/sunos/sunos_exec.h> int -exec_sunos32_aout_makecmds(l, epp) - struct lwp *l; - struct exec_package *epp; +exec_sunos32_aout_makecmds(struct lwp *l, struct exec_package *epp) { struct sunos_exec *sunmag = epp->ep_hdr; int error = ENOEXEC; diff --git a/sys/compat/sunos32/sunos32_ioctl.c b/sys/compat/sunos32/sunos32_ioctl.c index 96f70240847..9b94171adbb 100644 --- a/sys/compat/sunos32/sunos32_ioctl.c +++ b/sys/compat/sunos32/sunos32_ioctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: sunos32_ioctl.c,v 1.24 2007/12/04 18:40:22 dsl Exp $ */ +/* $NetBSD: sunos32_ioctl.c,v 1.25 2007/12/08 18:36:23 dsl Exp $ */ /* from: NetBSD: sunos_ioctl.c,v 1.35 2001/02/03 22:20:02 mrg Exp */ /* @@ -56,7 +56,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sunos32_ioctl.c,v 1.24 2007/12/04 18:40:22 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunos32_ioctl.c,v 1.25 2007/12/08 18:36:23 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd32.h" @@ -161,9 +161,7 @@ static void stio2stios(struct sunos_termio *, struct sunos_termios *); */ static void -stios2btios(st, bt) - struct sunos_termios *st; - struct termios *bt; +stios2btios(struct sunos_termios *st, struct termios *bt) { netbsd32_u_long l, r; @@ -283,9 +281,7 @@ stios2btios(st, bt) static void -btios2stios(bt, st) - struct termios *bt; - struct sunos_termios *st; +btios2stios(struct termios *bt, struct sunos_termios *st) { netbsd32_u_long l, r; int s; @@ -412,9 +408,7 @@ btios2stios(bt, st) } static void -stios2stio(ts, t) - struct sunos_termios *ts; - struct sunos_termio *t; +stios2stio(struct sunos_termios *ts, struct sunos_termio *t) { t->c_iflag = ts->c_iflag; t->c_oflag = ts->c_oflag; @@ -425,9 +419,7 @@ stios2stio(ts, t) } static void -stio2stios(t, ts) - struct sunos_termio *t; - struct sunos_termios *ts; +stio2stios(struct sunos_termio *t, struct sunos_termios *ts) { ts->c_iflag = t->c_iflag; ts->c_oflag = t->c_oflag; @@ -438,10 +430,7 @@ stio2stios(t, ts) } int -sunos32_sys_ioctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_ioctl(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_ioctl_args /* { int fd; @@ -945,9 +934,7 @@ static void sunos_to_bsd_flock(struct sunos_flock *, struct flock *); #define SUNOS_F_UNLCK 3 static void -bsd_to_sunos_flock(iflp, oflp) - struct flock *iflp; - struct sunos_flock *oflp; +bsd_to_sunos_flock(struct flock *iflp, struct sunos_flock *oflp) { switch (iflp->l_type) { case F_RDLCK: @@ -973,9 +960,7 @@ bsd_to_sunos_flock(iflp, oflp) static void -sunos_to_bsd_flock(iflp, oflp) - struct sunos_flock *iflp; - struct flock *oflp; +sunos_to_bsd_flock(struct sunos_flock *iflp, struct flock *oflp) { switch (iflp->l_type) { case SUNOS_F_RDLCK: @@ -1020,10 +1005,7 @@ static struct { }; int -sunos32_sys_fcntl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_fcntl(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_fcntl_args /* { syscallarg(int) fd; diff --git a/sys/compat/sunos32/sunos32_misc.c b/sys/compat/sunos32/sunos32_misc.c index f3acb1db985..2b1dafe7b52 100644 --- a/sys/compat/sunos32/sunos32_misc.c +++ b/sys/compat/sunos32/sunos32_misc.c @@ -1,4 +1,4 @@ -/* $NetBSD: sunos32_misc.c,v 1.53 2007/12/04 18:40:22 dsl Exp $ */ +/* $NetBSD: sunos32_misc.c,v 1.54 2007/12/08 18:36:24 dsl Exp $ */ /* from :NetBSD: sunos_misc.c,v 1.107 2000/12/01 19:25:10 jdolecek Exp */ /* @@ -79,7 +79,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sunos32_misc.c,v 1.53 2007/12/04 18:40:22 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunos32_misc.c,v 1.54 2007/12/08 18:36:24 dsl Exp $"); #define COMPAT_SUNOS 1 @@ -150,9 +150,7 @@ static void sunos32_sigvec_from_sigaction(struct netbsd32_sigvec *, const struct static int sunstatfs(struct statvfs *, void *); static void -sunos32_sigvec_to_sigaction(sv, sa) - const struct netbsd32_sigvec *sv; - struct sigaction *sa; +sunos32_sigvec_to_sigaction(const struct netbsd32_sigvec *sv, struct sigaction *sa) { /*XXX*/ extern void compat_43_sigmask_to_sigset(const int *, sigset_t *); @@ -174,10 +172,7 @@ void sunos32_sigvec_from_sigaction(sv, sa) } int -sunos32_sys_stime(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_stime(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_stime_args /* { syscallarg(sunos32_time_tp) tp; @@ -196,10 +191,7 @@ sunos32_sys_stime(l, v, retval) } int -sunos32_sys_wait4(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_wait4(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_wait4_args /* { syscallarg(int) pid; @@ -214,10 +206,7 @@ sunos32_sys_wait4(l, v, retval) } int -sunos32_sys_creat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_creat(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_creat_args /* { syscallarg(const netbsd32_charp) path; @@ -233,10 +222,7 @@ sunos32_sys_creat(l, v, retval) } int -sunos32_sys_access(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_access(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_access_args /* { syscallarg(const netbsd32_charp) path; @@ -253,9 +239,7 @@ sunos32_sys_access(l, v, retval) static inline void sunos32_from___stat13(struct stat *, struct netbsd32_stat43 *); static inline void -sunos32_from___stat13(sbp, sb32p) - struct stat *sbp; - struct netbsd32_stat43 *sb32p; +sunos32_from___stat13(struct stat *sbp, struct netbsd32_stat43 *sb32p) { sb32p->st_dev = sbp->st_dev; sb32p->st_ino = sbp->st_ino; @@ -282,10 +266,7 @@ sunos32_from___stat13(sbp, sb32p) int -sunos32_sys_stat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_stat(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_stat_args /* { syscallarg(const netbsd32_charp) path; @@ -307,10 +288,7 @@ sunos32_sys_stat(l, v, retval) } int -sunos32_sys_lstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_lstat(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_lstat_args /* { syscallarg(const netbsd32_charp) path; @@ -394,10 +372,7 @@ sunos32_execve_fetch_element(char * const *array, size_t index, char **value) } int -sunos32_sys_execv(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_execv(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_execv_args /* { syscallarg(const char *) path; @@ -410,10 +385,7 @@ sunos32_sys_execv(l, v, retval) } int -sunos32_sys_execve(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_execve(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_execve_args /* { syscallarg(const char *) path; @@ -428,10 +400,7 @@ sunos32_sys_execve(l, v, retval) } int -sunos32_sys_omsync(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_omsync(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_omsync_args /* { syscallarg(netbsd32_caddr_t) addr; @@ -448,10 +417,7 @@ sunos32_sys_omsync(l, v, retval) } int -sunos32_sys_unmount(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_unmount(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_unmount_args /* { syscallarg(netbsd32_charp) path; @@ -489,10 +455,7 @@ static struct { }; int -sunos32_sys_mount(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_mount(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_mount_args /* { syscallarg(netbsd32_charp) type; @@ -566,10 +529,7 @@ sunos32_sys_mount(l, v, retval) #if defined(NFS) int -async_daemon(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +async_daemon(struct lwp *l, void *v, register_t *retval) { struct netbsd32_nfssvc_args ouap; @@ -584,17 +544,13 @@ void native_to_sunos_sigset(const sigset_t *, int *); void sunos_to_native_sigset(const int, sigset_t *); inline void -native_to_sunos_sigset(ss, mask) - const sigset_t *ss; - int *mask; +native_to_sunos_sigset(const sigset_t *ss, int *mask) { *mask = ss->__bits[0]; } inline void -sunos_to_native_sigset(mask, ss) - const int mask; - sigset_t *ss; +sunos_to_native_sigset(const int mask, sigset_t *ss) { ss->__bits[0] = mask; @@ -604,10 +560,7 @@ sunos_to_native_sigset(mask, ss) } int -sunos32_sys_sigpending(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_sigpending(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_sigpending_args /* { syscallarg(netbsd32_intp) mask; @@ -622,10 +575,7 @@ sunos32_sys_sigpending(l, v, retval) } int -sunos32_sys_sigsuspend(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_sigsuspend(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_sigsuspend_args /* { syscallarg(int) mask; @@ -646,10 +596,7 @@ sunos32_sys_sigsuspend(l, v, retval) * This is quite ugly, but what do you expect from compatibility code? */ int -sunos32_sys_getdents(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_getdents(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_getdents_args /* { syscallarg(int) fd; @@ -781,10 +728,7 @@ out: #define SUNOS32__MAP_NEW 0x80000000 /* if not, old mmap & cannot handle */ int -sunos32_sys_mmap(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_mmap(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_mmap_args /* { syscallarg(netbsd32_voidp) addr; @@ -831,10 +775,7 @@ sunos32_sys_mmap(l, v, retval) #define MC_UNLOCKAS 6 int -sunos32_sys_mctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_mctl(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_mctl_args /* { syscallarg(netbsd32_voidp) addr; @@ -854,10 +795,7 @@ sunos32_sys_mctl(l, v, retval) } int -sunos32_sys_setsockopt(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_setsockopt(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_setsockopt_args /* { syscallarg(int) s; @@ -926,10 +864,7 @@ sunos32_sys_setsockopt(l, v, retval) static inline int sunos32_sys_socket_common(struct lwp *, register_t *, int type); static inline int -sunos32_sys_socket_common(l, retval, type) - struct lwp *l; - register_t *retval; - int type; +sunos32_sys_socket_common(struct lwp *l, register_t *retval, int type) { struct socket *so; struct proc *p = l->l_proc; @@ -948,10 +883,7 @@ sunos32_sys_socket_common(l, retval, type) } int -sunos32_sys_socket(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_socket(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_socket_args /* { syscallarg(int) domain; @@ -967,10 +899,7 @@ sunos32_sys_socket(l, v, retval) } int -sunos32_sys_socketpair(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_socketpair(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_socketpair_args /* { syscallarg(int) domain; @@ -991,19 +920,13 @@ sunos32_sys_socketpair(l, v, retval) * XXX: This needs cleaning up. */ int -sunos32_sys_auditsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_auditsys(struct lwp *l, void *v, register_t *retval) { return 0; } int -sunos32_sys_uname(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_uname(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_uname_args /* { syscallarg(sunos32_utsnamep_t) name; @@ -1024,10 +947,7 @@ sunos32_sys_uname(l, v, retval) } int -sunos32_sys_setpgrp(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_setpgrp(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_setpgrp_args /* { syscallarg(int) pid; @@ -1049,10 +969,7 @@ sunos32_sys_setpgrp(l, v, retval) } int -sunos32_sys_open(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_open(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_open_args /* { syscallarg(const netbsd32_charp) path; @@ -1096,10 +1013,7 @@ sunos32_sys_open(l, v, retval) #if defined (NFSSERVER) int -sunos32_sys_nfssvc(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_nfssvc(struct lwp *l, void *v, register_t *retval) { #if 0 struct sunos32_sys_nfssvc_args *uap = v; @@ -1130,10 +1044,7 @@ sunos32_sys_nfssvc(l, v, retval) #endif /* NFSSERVER */ int -sunos32_sys_ustat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_ustat(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_ustat_args /* { syscallarg(int) dev; @@ -1155,20 +1066,14 @@ sunos32_sys_ustat(l, v, retval) } int -sunos32_sys_quotactl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_quotactl(struct lwp *l, void *v, register_t *retval) { return EINVAL; } int -sunos32_sys_vhangup(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_vhangup(struct lwp *l, void *v, register_t *retval) { struct proc *p = l->l_proc; struct session *sp = p->p_session; @@ -1190,9 +1095,7 @@ sunos32_sys_vhangup(l, v, retval) } static int -sunstatfs(sp, sbuf) - struct statvfs *sp; - void *sbuf; +sunstatfs(struct statvfs *sp, void *sbuf) { struct sunos_statfs ssfs; @@ -1209,10 +1112,7 @@ sunstatfs(sp, sbuf) } int -sunos32_sys_statfs(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_statfs(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_statfs_args /* { syscallarg(const netbsd32_charp) path; @@ -1239,10 +1139,7 @@ sunos32_sys_statfs(l, v, retval) } int -sunos32_sys_fstatfs(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_fstatfs(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_fstatfs_args /* { syscallarg(int) fd; @@ -1269,10 +1166,7 @@ sunos32_sys_fstatfs(l, v, retval) } int -sunos32_sys_exportfs(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_exportfs(struct lwp *l, void *v, register_t *retval) { /* * XXX: should perhaps translate into a mount(2) @@ -1282,10 +1176,7 @@ sunos32_sys_exportfs(l, v, retval) } int -sunos32_sys_mknod(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_mknod(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_mknod_args /* { syscallarg(const netbsd32_charp) path; @@ -1315,10 +1206,7 @@ sunos32_sys_mknod(l, v, retval) #define SUNOS_SC_VERSION 8 int -sunos32_sys_sysconf(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_sysconf(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_sysconf_args /* { syscallarg(int) name; @@ -1364,10 +1252,7 @@ sunos32_sys_sysconf(l, v, retval) #define SUNOS_RLIM_NLIMITS 7 int -sunos32_sys_getrlimit(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_getrlimit(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_getrlimit_args /* { syscallarg(u_int) which; @@ -1384,10 +1269,7 @@ sunos32_sys_getrlimit(l, v, retval) } int -sunos32_sys_setrlimit(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_setrlimit(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_setrlimit_args /* { syscallarg(u_int) which; @@ -1422,10 +1304,7 @@ static const int nreqs = sizeof(sreq2breq) / sizeof(sreq2breq[0]); #endif int -sunos32_sys_ptrace(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_ptrace(struct lwp *l, void *v, register_t *retval) { #if defined(PTRACE) || defined(_LKM) struct sunos32_sys_ptrace_args /* { @@ -1490,10 +1369,7 @@ static struct sunos_howto_conv { }; int -sunos32_sys_reboot(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_reboot(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_reboot_args /* { syscallarg(int) howto; @@ -1540,10 +1416,7 @@ sunos32_sys_reboot(l, v, retval) */ /* ARGSUSED */ int -sunos32_sys_sigvec(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +sunos32_sys_sigvec(struct lwp *l, void *v, register_t *retval) { struct sunos32_sys_sigvec_args /* { syscallarg(int) signum; diff --git a/sys/compat/svr4/svr4_exec_elf64.c b/sys/compat/svr4/svr4_exec_elf64.c index a90682f7ff6..5db175c7dc7 100644 --- a/sys/compat/svr4/svr4_exec_elf64.c +++ b/sys/compat/svr4/svr4_exec_elf64.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_exec_elf64.c,v 1.12 2007/10/19 12:16:40 ad Exp $ */ +/* $NetBSD: svr4_exec_elf64.c,v 1.13 2007/12/08 18:36:24 dsl Exp $ */ /*- * Copyright (c) 1994 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_exec_elf64.c,v 1.12 2007/10/19 12:16:40 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_exec_elf64.c,v 1.13 2007/12/08 18:36:24 dsl Exp $"); #define ELFSIZE 64 /* XXX should die */ @@ -62,12 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_exec_elf64.c,v 1.12 2007/10/19 12:16:40 ad Exp #include <compat/svr4/svr4_errno.h> int -svr4_elf64_probe(l, epp, eh, itp, pos) - struct lwp *l; - struct exec_package *epp; - void *eh; - char *itp; - vaddr_t *pos; +svr4_elf64_probe(struct lwp *l, struct exec_package *epp, void *eh, char *itp, vaddr_t *pos) { int error; diff --git a/sys/compat/svr4/svr4_fcntl.c b/sys/compat/svr4/svr4_fcntl.c index 15b3663d37c..27676dace79 100644 --- a/sys/compat/svr4/svr4_fcntl.c +++ b/sys/compat/svr4/svr4_fcntl.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_fcntl.c,v 1.62 2007/12/04 18:40:22 dsl Exp $ */ +/* $NetBSD: svr4_fcntl.c,v 1.63 2007/12/08 18:36:24 dsl Exp $ */ /*- * Copyright (c) 1994, 1997 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_fcntl.c,v 1.62 2007/12/04 18:40:22 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_fcntl.c,v 1.63 2007/12/08 18:36:24 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -74,8 +74,7 @@ static int fd_truncate(struct lwp *, int, struct flock *, register_t *); static int -svr4_to_bsd_flags(l) - int l; +svr4_to_bsd_flags(int l) { int r = 0; r |= (l & SVR4_O_RDONLY) ? O_RDONLY : 0; @@ -97,8 +96,7 @@ svr4_to_bsd_flags(l) static int -bsd_to_svr4_flags(l) - int l; +bsd_to_svr4_flags(int l) { int r = 0; r |= (l & O_RDONLY) ? SVR4_O_RDONLY : 0; @@ -120,9 +118,7 @@ bsd_to_svr4_flags(l) static void -bsd_to_svr4_flock(iflp, oflp) - struct flock *iflp; - struct svr4_flock *oflp; +bsd_to_svr4_flock(struct flock *iflp, struct svr4_flock *oflp) { switch (iflp->l_type) { case F_RDLCK: @@ -148,9 +144,7 @@ bsd_to_svr4_flock(iflp, oflp) static void -svr4_to_bsd_flock(iflp, oflp) - struct svr4_flock *iflp; - struct flock *oflp; +svr4_to_bsd_flock(struct svr4_flock *iflp, struct flock *oflp) { switch (iflp->l_type) { case SVR4_F_RDLCK: @@ -175,9 +169,7 @@ svr4_to_bsd_flock(iflp, oflp) } static void -bsd_to_svr4_flock64(iflp, oflp) - struct flock *iflp; - struct svr4_flock64 *oflp; +bsd_to_svr4_flock64(struct flock *iflp, struct svr4_flock64 *oflp) { switch (iflp->l_type) { case F_RDLCK: @@ -203,9 +195,7 @@ bsd_to_svr4_flock64(iflp, oflp) static void -svr4_to_bsd_flock64(iflp, oflp) - struct svr4_flock64 *iflp; - struct flock *oflp; +svr4_to_bsd_flock64(struct svr4_flock64 *iflp, struct flock *oflp) { switch (iflp->l_type) { case SVR4_F_RDLCK: @@ -276,11 +266,7 @@ out: static int -fd_truncate(l, fd, flp, retval) - struct lwp *l; - int fd; - struct flock *flp; - register_t *retval; +fd_truncate(struct lwp *l, int fd, struct flock *flp, register_t *retval) { struct filedesc *fdp = l->l_proc->p_fd; struct file *fp; @@ -343,10 +329,7 @@ fd_truncate(l, fd, flp, retval) int -svr4_sys_open(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_open(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_open_args *uap = v; int error; @@ -383,20 +366,14 @@ svr4_sys_open(l, v, retval) int -svr4_sys_open64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_open64(struct lwp *l, void *v, register_t *retval) { return svr4_sys_open(l, v, retval); } int -svr4_sys_creat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_creat(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_creat_args *uap = v; struct sys_open_args cup; @@ -410,20 +387,14 @@ svr4_sys_creat(l, v, retval) int -svr4_sys_creat64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_creat64(struct lwp *l, void *v, register_t *retval) { return svr4_sys_creat(l, v, retval); } int -svr4_sys_llseek(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_llseek(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_llseek_args *uap = v; struct sys_lseek_args ap; @@ -443,10 +414,7 @@ svr4_sys_llseek(l, v, retval) } int -svr4_sys_access(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_access(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_access_args *uap = v; struct sys_access_args cup; @@ -459,10 +427,7 @@ svr4_sys_access(l, v, retval) int -svr4_sys_pread(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_pread(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_pread_args *uap = v; struct sys_pread_args pra; @@ -481,10 +446,7 @@ svr4_sys_pread(l, v, retval) int -svr4_sys_pread64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_pread64(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_pread64_args *uap = v; @@ -504,10 +466,7 @@ svr4_sys_pread64(l, v, retval) int -svr4_sys_pwrite(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_pwrite(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_pwrite_args *uap = v; struct sys_pwrite_args pwa; @@ -526,10 +485,7 @@ svr4_sys_pwrite(l, v, retval) int -svr4_sys_pwrite64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_pwrite64(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_pwrite64_args *uap = v; struct sys_pwrite_args pwa; @@ -548,10 +504,7 @@ svr4_sys_pwrite64(l, v, retval) int -svr4_sys_fcntl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_fcntl(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_fcntl_args *uap = v; struct sys_fcntl_args fa; diff --git a/sys/compat/svr4/svr4_filio.c b/sys/compat/svr4/svr4_filio.c index 150370a6df7..bdee3dee563 100644 --- a/sys/compat/svr4/svr4_filio.c +++ b/sys/compat/svr4/svr4_filio.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_filio.c,v 1.17 2007/03/04 06:01:32 christos Exp $ */ +/* $NetBSD: svr4_filio.c,v 1.18 2007/12/08 18:36:24 dsl Exp $ */ /*- * Copyright (c) 1994 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_filio.c,v 1.17 2007/03/04 06:01:32 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_filio.c,v 1.18 2007/12/08 18:36:24 dsl Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -66,13 +66,7 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_filio.c,v 1.17 2007/03/04 06:01:32 christos Exp int -svr4_fil_ioctl(fp, l, retval, fd, cmd, data) - struct file *fp; - struct lwp *l; - register_t *retval; - int fd; - u_long cmd; - void *data; +svr4_fil_ioctl(struct file *fp, struct lwp *l, register_t *retval, int fd, u_long cmd, void *data) { struct proc *p = l->l_proc; int error; diff --git a/sys/compat/svr4/svr4_ioctl.c b/sys/compat/svr4/svr4_ioctl.c index 3c4028f09c9..3a1e2ca3d4a 100644 --- a/sys/compat/svr4/svr4_ioctl.c +++ b/sys/compat/svr4/svr4_ioctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_ioctl.c,v 1.31 2007/12/04 18:40:23 dsl Exp $ */ +/* $NetBSD: svr4_ioctl.c,v 1.32 2007/12/08 18:36:24 dsl Exp $ */ /*- * Copyright (c) 1994 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_ioctl.c,v 1.31 2007/12/04 18:40:23 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_ioctl.c,v 1.32 2007/12/08 18:36:24 dsl Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -98,10 +98,7 @@ svr4_decode_cmd(cmd, dir, c, num, argsiz) #endif int -svr4_sys_ioctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_ioctl(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_ioctl_args *uap = v; struct proc *p = l->l_proc; diff --git a/sys/compat/svr4/svr4_ipc.c b/sys/compat/svr4/svr4_ipc.c index b28f4eca037..1d3ca6df6b4 100644 --- a/sys/compat/svr4/svr4_ipc.c +++ b/sys/compat/svr4/svr4_ipc.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_ipc.c,v 1.23 2007/12/04 18:40:23 dsl Exp $ */ +/* $NetBSD: svr4_ipc.c,v 1.24 2007/12/08 18:36:25 dsl Exp $ */ /*- * Copyright (c) 1995 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_ipc.c,v 1.23 2007/12/04 18:40:23 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_ipc.c,v 1.24 2007/12/08 18:36:25 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_sysv.h" @@ -109,9 +109,7 @@ static int svr4_shmctl(struct lwp *, void *, register_t *); #if defined(SYSVMSG) || defined(SYSVSHM) || defined(SYSVSEM) static void -svr4_to_bsd_ipc_perm(spp, bpp) - const struct svr4_ipc_perm *spp; - struct ipc_perm *bpp; +svr4_to_bsd_ipc_perm(const struct svr4_ipc_perm *spp, struct ipc_perm *bpp) { bpp->_key = spp->key; bpp->uid = spp->uid; @@ -123,9 +121,7 @@ svr4_to_bsd_ipc_perm(spp, bpp) } static void -bsd_to_svr4_ipc_perm(bpp, spp) - const struct ipc_perm *bpp; - struct svr4_ipc_perm *spp; +bsd_to_svr4_ipc_perm(const struct ipc_perm *bpp, struct svr4_ipc_perm *spp) { spp->key = bpp->_key; spp->uid = bpp->uid; @@ -139,9 +135,7 @@ bsd_to_svr4_ipc_perm(bpp, spp) #ifdef SYSVSEM static void -bsd_to_svr4_semid_ds(bds, sds) - const struct semid_ds *bds; - struct svr4_semid_ds *sds; +bsd_to_svr4_semid_ds(const struct semid_ds *bds, struct svr4_semid_ds *sds) { bsd_to_svr4_ipc_perm(&bds->sem_perm, &sds->sem_perm); sds->sem_base = (struct svr4_sem *) bds->_sem_base; @@ -151,9 +145,7 @@ bsd_to_svr4_semid_ds(bds, sds) } static void -svr4_to_bsd_semid_ds(sds, bds) - const struct svr4_semid_ds *sds; - struct semid_ds *bds; +svr4_to_bsd_semid_ds(const struct svr4_semid_ds *sds, struct semid_ds *bds) { svr4_to_bsd_ipc_perm(&sds->sem_perm, &bds->sem_perm); bds->_sem_base = (struct __sem *) sds->sem_base; @@ -171,10 +163,7 @@ struct svr4_sys_semctl_args { }; static int -svr4_semctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_semctl(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_semctl_args *uap = v; struct semid_ds sembuf; @@ -260,10 +249,7 @@ struct svr4_sys_semget_args { }; static int -svr4_semget(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_semget(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_semget_args *uap = v; struct sys_semget_args ap; @@ -283,10 +269,7 @@ struct svr4_sys_semop_args { }; static int -svr4_semop(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_semop(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_semop_args *uap = v; struct sys_semop_args ap; @@ -300,10 +283,7 @@ svr4_semop(l, v, retval) } int -svr4_sys_semsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_semsys(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_semsys_args *uap = v; @@ -324,9 +304,7 @@ svr4_sys_semsys(l, v, retval) #ifdef SYSVMSG static void -bsd_to_svr4_msqid_ds(bds, sds) - const struct msqid_ds *bds; - struct svr4_msqid_ds *sds; +bsd_to_svr4_msqid_ds(const struct msqid_ds *bds, struct svr4_msqid_ds *sds) { bsd_to_svr4_ipc_perm(&bds->msg_perm, &sds->msg_perm); sds->msg_first = (struct svr4_msg *) bds->_msg_first; @@ -348,9 +326,7 @@ bsd_to_svr4_msqid_ds(bds, sds) } static void -svr4_to_bsd_msqid_ds(sds, bds) - const struct svr4_msqid_ds *sds; - struct msqid_ds *bds; +svr4_to_bsd_msqid_ds(const struct svr4_msqid_ds *sds, struct msqid_ds *bds) { svr4_to_bsd_ipc_perm(&sds->msg_perm, &bds->msg_perm); bds->_msg_first = (struct __msg *) sds->msg_first; @@ -379,10 +355,7 @@ struct svr4_sys_msgsnd_args { }; static int -svr4_msgsnd(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_msgsnd(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_msgsnd_args *uap = v; struct sys_msgsnd_args ap; @@ -405,10 +378,7 @@ struct svr4_sys_msgrcv_args { }; static int -svr4_msgrcv(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_msgrcv(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_msgrcv_args *uap = v; struct sys_msgrcv_args ap; @@ -429,10 +399,7 @@ struct svr4_sys_msgget_args { }; static int -svr4_msgget(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_msgget(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_msgget_args *uap = v; struct sys_msgget_args ap; @@ -451,10 +418,7 @@ struct svr4_sys_msgctl_args { }; static int -svr4_msgctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_msgctl(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_msgctl_args *uap = v; struct svr4_msqid_ds ss; @@ -486,10 +450,7 @@ svr4_msgctl(l, v, retval) } int -svr4_sys_msgsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_msgsys(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_msgsys_args *uap = v; @@ -513,9 +474,7 @@ svr4_sys_msgsys(l, v, retval) #ifdef SYSVSHM static void -bsd_to_svr4_shmid_ds(bds, sds) - const struct shmid_ds *bds; - struct svr4_shmid_ds *sds; +bsd_to_svr4_shmid_ds(const struct shmid_ds *bds, struct svr4_shmid_ds *sds) { bsd_to_svr4_ipc_perm(&bds->shm_perm, &sds->shm_perm); sds->shm_segsz = bds->shm_segsz; @@ -534,9 +493,7 @@ bsd_to_svr4_shmid_ds(bds, sds) } static void -svr4_to_bsd_shmid_ds(sds, bds) - const struct svr4_shmid_ds *sds; - struct shmid_ds *bds; +svr4_to_bsd_shmid_ds(const struct svr4_shmid_ds *sds, struct shmid_ds *bds) { svr4_to_bsd_ipc_perm(&sds->shm_perm, &bds->shm_perm); bds->shm_segsz = sds->shm_segsz; @@ -557,10 +514,7 @@ struct svr4_sys_shmat_args { }; static int -svr4_shmat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_shmat(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_shmat_args *uap = v; struct sys_shmat_args ap; @@ -578,10 +532,7 @@ struct svr4_sys_shmdt_args { }; static int -svr4_shmdt(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_shmdt(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_shmdt_args *uap = v; struct sys_shmdt_args ap; @@ -599,10 +550,7 @@ struct svr4_sys_shmget_args { }; static int -svr4_shmget(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_shmget(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_shmget_args *uap = v; struct sys_shmget_args ap; @@ -622,10 +570,7 @@ struct svr4_sys_shmctl_args { }; int -svr4_shmctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_shmctl(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_shmctl_args *uap = v; struct shmid_ds bs; @@ -663,10 +608,7 @@ svr4_shmctl(l, v, retval) } int -svr4_sys_shmsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_shmsys(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_shmsys_args *uap = v; diff --git a/sys/compat/svr4/svr4_lwp.c b/sys/compat/svr4/svr4_lwp.c index bdc55bf5bb9..9375b809594 100644 --- a/sys/compat/svr4/svr4_lwp.c +++ b/sys/compat/svr4/svr4_lwp.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_lwp.c,v 1.14 2007/02/09 21:55:24 ad Exp $ */ +/* $NetBSD: svr4_lwp.c,v 1.15 2007/12/08 18:36:25 dsl Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_lwp.c,v 1.14 2007/02/09 21:55:24 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_lwp.c,v 1.15 2007/12/08 18:36:25 dsl Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -67,19 +67,13 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_lwp.c,v 1.14 2007/02/09 21:55:24 ad Exp $"); int -svr4_sys__lwp_self(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys__lwp_self(struct lwp *l, void *v, register_t *retval) { return sys__lwp_self(l, v, retval); } int -svr4_sys__lwp_create(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys__lwp_create(struct lwp *l, void *v, register_t *retval) { struct svr4_sys__lwp_create_args *uap = v; struct sys__lwp_create_args lc; @@ -108,10 +102,7 @@ svr4_sys__lwp_create(l, v, retval) } int -svr4_sys__lwp_kill(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys__lwp_kill(struct lwp *l, void *v, register_t *retval) { struct svr4_sys__lwp_kill_args *uap = v; struct sys_kill_args ap; @@ -147,10 +138,7 @@ svr4_sys__lwp_exit(struct lwp *l, void *v, register_t *retval) } int -svr4_sys__lwp_wait(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys__lwp_wait(struct lwp *l, void *v, register_t *retval) { struct svr4_sys__lwp_wait_args *uap = v; struct sys__lwp_wait_args ap; @@ -162,10 +150,7 @@ svr4_sys__lwp_wait(l, v, retval) } int -svr4_sys__lwp_suspend(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys__lwp_suspend(struct lwp *l, void *v, register_t *retval) { struct svr4_sys__lwp_suspend_args *uap = v; struct sys__lwp_suspend_args ap; @@ -177,10 +162,7 @@ svr4_sys__lwp_suspend(l, v, retval) int -svr4_sys__lwp_continue(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys__lwp_continue(struct lwp *l, void *v, register_t *retval) { struct svr4_sys__lwp_continue_args *uap = v; struct sys__lwp_continue_args ap; diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c index 0c88f96fa00..73fcc203b59 100644 --- a/sys/compat/svr4/svr4_misc.c +++ b/sys/compat/svr4/svr4_misc.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_misc.c,v 1.133 2007/12/04 18:40:23 dsl Exp $ */ +/* $NetBSD: svr4_misc.c,v 1.134 2007/12/08 18:36:25 dsl Exp $ */ /*- * Copyright (c) 1994 The NetBSD Foundation, Inc. @@ -44,7 +44,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_misc.c,v 1.133 2007/12/04 18:40:23 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_misc.c,v 1.134 2007/12/08 18:36:25 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -116,10 +116,7 @@ static int svr4_mknod(struct lwp *, register_t *, const char *, svr4_mode_t, svr4_dev_t); int -svr4_sys_wait(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_wait(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_wait_args *uap = v; int error, was_zombie; @@ -156,10 +153,7 @@ svr4_sys_wait(l, v, retval) int -svr4_sys_execv(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_execv(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_execv_args /* { syscallarg(char *) path; @@ -176,10 +170,7 @@ svr4_sys_execv(l, v, retval) int -svr4_sys_execve(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_execve(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_execve_args /* { syscallarg(const char *) path; @@ -221,10 +212,7 @@ svr4_sys_time(struct lwp *l, void *v, register_t *retval) * This is quite ugly, but what do you expect from compatibility code? */ int -svr4_sys_getdents64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_getdents64(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_getdents64_args *uap = v; struct proc *p = l->l_proc; @@ -346,10 +334,7 @@ out: int -svr4_sys_getdents(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_getdents(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_getdents_args *uap = v; struct proc *p = l->l_proc; @@ -472,8 +457,7 @@ out: static int -svr4_to_bsd_mmap_flags(f) - int f; +svr4_to_bsd_mmap_flags(int f) { int type = f & SVR4_MAP_TYPE; int nf; @@ -490,10 +474,7 @@ svr4_to_bsd_mmap_flags(f) int -svr4_sys_mmap(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_mmap(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_mmap_args *uap = v; struct sys_mmap_args mm; @@ -520,10 +501,7 @@ svr4_sys_mmap(l, v, retval) int -svr4_sys_mmap64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_mmap64(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_mmap64_args *uap = v; struct sys_mmap_args mm; @@ -550,12 +528,7 @@ svr4_sys_mmap64(l, v, retval) static int -svr4_mknod(l, retval, path, mode, dev) - struct lwp *l; - register_t *retval; - const char *path; - svr4_mode_t mode; - svr4_dev_t dev; +svr4_mknod(struct lwp *l, register_t *retval, const char *path, svr4_mode_t mode, svr4_dev_t dev) { if (S_ISFIFO(mode)) { struct sys_mkfifo_args ap; @@ -573,10 +546,7 @@ svr4_mknod(l, retval, path, mode, dev) int -svr4_sys_mknod(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_mknod(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_mknod_args *uap = v; return svr4_mknod(l, retval, @@ -586,10 +556,7 @@ svr4_sys_mknod(l, v, retval) int -svr4_sys_xmknod(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_xmknod(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_xmknod_args *uap = v; return svr4_mknod(l, retval, @@ -782,18 +749,14 @@ svr4_sys_break(struct lwp *l, void *v, register_t *retval) static inline clock_t -timeval_to_clock_t(tv) - struct timeval *tv; +timeval_to_clock_t(struct timeval *tv) { return tv->tv_sec * hz + tv->tv_usec / (1000000 / hz); } int -svr4_sys_times(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_times(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_times_args *uap = v; struct tms tms; @@ -821,10 +784,7 @@ svr4_sys_times(l, v, retval) int -svr4_sys_ulimit(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_ulimit(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_ulimit_args *uap = v; struct proc *p = l->l_proc; @@ -869,10 +829,7 @@ svr4_sys_ulimit(l, v, retval) int -svr4_sys_pgrpsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_pgrpsys(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_pgrpsys_args *uap = v; struct proc *p = l->l_proc; @@ -984,10 +941,7 @@ svr4_hrtcntl(struct lwp *l, struct svr4_hrtcntl_args *uap, int -svr4_sys_hrtsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_hrtsys(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_hrtsys_args *uap = v; @@ -1061,10 +1015,7 @@ svr4_setinfo(int pid, struct rusage *ru, int st, svr4_siginfo_t *s) int -svr4_sys_waitsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_waitsys(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_waitsys_args *uap = v; int options, status; @@ -1181,10 +1132,7 @@ svr4_copyout_statvfs64(const struct statvfs *bfs, struct svr4_statvfs64 *sufs) int -svr4_sys_statvfs(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_statvfs(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_statvfs_args *uap = v; struct statvfs *sb; @@ -1200,10 +1148,7 @@ svr4_sys_statvfs(l, v, retval) int -svr4_sys_fstatvfs(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_fstatvfs(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_fstatvfs_args *uap = v; struct statvfs *sb; @@ -1219,10 +1164,7 @@ svr4_sys_fstatvfs(l, v, retval) int -svr4_sys_statvfs64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_statvfs64(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_statvfs64_args *uap = v; struct statvfs *sb; @@ -1238,10 +1180,7 @@ svr4_sys_statvfs64(l, v, retval) int -svr4_sys_fstatvfs64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_fstatvfs64(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_fstatvfs64_args *uap = v; struct statvfs *sb; @@ -1256,10 +1195,7 @@ svr4_sys_fstatvfs64(l, v, retval) } int -svr4_sys_alarm(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_alarm(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_alarm_args *uap = v; struct itimerval tp; @@ -1320,10 +1256,7 @@ svr4_sys_facl(struct lwp *l, void *v, register_t *retval) int -svr4_sys_acl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_acl(struct lwp *l, void *v, register_t *retval) { return svr4_sys_facl(l, v, retval); /* XXX: for now the same */ } @@ -1341,10 +1274,7 @@ svr4_sys_auditsys(struct lwp *l, void *v, int -svr4_sys_memcntl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_memcntl(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_memcntl_args *uap = v; switch (SCARG(uap, cmd)) { @@ -1380,10 +1310,7 @@ svr4_sys_memcntl(l, v, retval) int -svr4_sys_nice(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_nice(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_nice_args *uap = v; struct sys_setpriority_args ap; @@ -1404,10 +1331,7 @@ svr4_sys_nice(l, v, retval) int -svr4_sys_resolvepath(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_resolvepath(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_resolvepath_args *uap = v; struct nameidata nd; diff --git a/sys/compat/svr4/svr4_net.c b/sys/compat/svr4/svr4_net.c index 4f0c8ff3ad8..8ec72913145 100644 --- a/sys/compat/svr4/svr4_net.c +++ b/sys/compat/svr4/svr4_net.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_net.c,v 1.49 2007/12/04 18:40:23 dsl Exp $ */ +/* $NetBSD: svr4_net.c,v 1.50 2007/12/08 18:36:25 dsl Exp $ */ /*- * Copyright (c) 1994 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_net.c,v 1.49 2007/12/04 18:40:23 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_net.c,v 1.50 2007/12/08 18:36:25 dsl Exp $"); #define COMPAT_SVR4 1 @@ -210,9 +210,7 @@ svr4_netopen(dev_t dev, int flag, int mode, struct lwp *l) int -svr4_soo_close(fp, l) - struct file *fp; - struct lwp *l; +svr4_soo_close(struct file *fp, struct lwp *l) { struct socket *so = (struct socket *) fp->f_data; @@ -223,8 +221,7 @@ svr4_soo_close(fp, l) struct svr4_strm * -svr4_stream_get(fp) - struct file *fp; +svr4_stream_get(struct file *fp) { struct socket *so; struct svr4_strm *st; diff --git a/sys/compat/svr4/svr4_resource.c b/sys/compat/svr4/svr4_resource.c index d663b82a693..a16d8ac8b59 100644 --- a/sys/compat/svr4/svr4_resource.c +++ b/sys/compat/svr4/svr4_resource.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_resource.c,v 1.13 2007/12/04 18:40:23 dsl Exp $ */ +/* $NetBSD: svr4_resource.c,v 1.14 2007/12/08 18:36:25 dsl Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_resource.c,v 1.13 2007/12/04 18:40:23 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_resource.c,v 1.14 2007/12/08 18:36:25 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -57,8 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_resource.c,v 1.13 2007/12/04 18:40:23 dsl Exp $ static inline int svr4_to_native_rl(int); static inline int -svr4_to_native_rl(rl) - int rl; +svr4_to_native_rl(int rl) { switch (rl) { case SVR4_RLIMIT_CPU: diff --git a/sys/compat/svr4/svr4_signal.c b/sys/compat/svr4/svr4_signal.c index 3bcec424bf5..6e0e555e7c7 100644 --- a/sys/compat/svr4/svr4_signal.c +++ b/sys/compat/svr4/svr4_signal.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_signal.c,v 1.60 2007/12/04 18:40:23 dsl Exp $ */ +/* $NetBSD: svr4_signal.c,v 1.61 2007/12/08 18:36:25 dsl Exp $ */ /*- * Copyright (c) 1994, 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_signal.c,v 1.60 2007/12/04 18:40:23 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_signal.c,v 1.61 2007/12/08 18:36:25 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -81,8 +81,7 @@ extern const int native_to_svr4_signo[]; extern const int svr4_to_native_signo[]; static inline void -svr4_sigfillset(s) - svr4_sigset_t *s; +svr4_sigfillset(svr4_sigset_t *s) { int i; @@ -93,9 +92,7 @@ svr4_sigfillset(s) } void -svr4_to_native_sigset(sss, bss) - const svr4_sigset_t *sss; - sigset_t *bss; +svr4_to_native_sigset(const svr4_sigset_t *sss, sigset_t *bss) { int i, newsig; @@ -111,9 +108,7 @@ svr4_to_native_sigset(sss, bss) void -native_to_svr4_sigset(bss, sss) - const sigset_t *bss; - svr4_sigset_t *sss; +native_to_svr4_sigset(const sigset_t *bss, svr4_sigset_t *sss) { int i, newsig; @@ -131,9 +126,7 @@ native_to_svr4_sigset(bss, sss) * XXX: Only a subset of the flags is currently implemented. */ void -svr4_to_native_sigaction(ssa, bsa) - const struct svr4_sigaction *ssa; - struct sigaction *bsa; +svr4_to_native_sigaction(const struct svr4_sigaction *ssa, struct sigaction *bsa) { bsa->sa_handler = (sig_t) ssa->svr4_sa_handler; @@ -160,9 +153,7 @@ svr4_to_native_sigaction(ssa, bsa) } void -native_to_svr4_sigaction(bsa, ssa) - const struct sigaction *bsa; - struct svr4_sigaction *ssa; +native_to_svr4_sigaction(const struct sigaction *bsa, struct svr4_sigaction *ssa) { ssa->svr4_sa_handler = (svr4_sig_t) bsa->sa_handler; @@ -227,10 +218,7 @@ svr4_sys_sigaltstack(struct lwp *l, void *v, register_t *retval) * Stolen from the ibcs2 one */ int -svr4_sys_signal(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_signal(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_signal_args /* { syscallarg(int) signum; @@ -405,10 +393,7 @@ svr4_sys_pause(struct lwp *l, void *v, register_t *retval) } int -svr4_sys_kill(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_kill(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_kill_args /* { syscallarg(int) pid; @@ -422,9 +407,7 @@ svr4_sys_kill(l, v, retval) } void -svr4_getcontext(l, uc) - struct lwp *l; - struct svr4_ucontext *uc; +svr4_getcontext(struct lwp *l, struct svr4_ucontext *uc) { sigset_t mask; struct proc *p = l->l_proc; @@ -455,9 +438,7 @@ svr4_getcontext(l, uc) int -svr4_setcontext(l, uc) - struct lwp *l; - struct svr4_ucontext *uc; +svr4_setcontext(struct lwp *l, struct svr4_ucontext *uc) { struct proc *p = l->l_proc; sigset_t mask; @@ -478,10 +459,7 @@ svr4_setcontext(l, uc) } int -svr4_sys_context(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_context(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_context_args /* { syscallarg(int) func; diff --git a/sys/compat/svr4/svr4_socket.c b/sys/compat/svr4/svr4_socket.c index 18a13ab7e06..c073e8e928b 100644 --- a/sys/compat/svr4/svr4_socket.c +++ b/sys/compat/svr4/svr4_socket.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_socket.c,v 1.16 2007/02/09 21:55:24 ad Exp $ */ +/* $NetBSD: svr4_socket.c,v 1.17 2007/12/08 18:36:25 dsl Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_socket.c,v 1.16 2007/02/09 21:55:24 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_socket.c,v 1.17 2007/12/08 18:36:25 dsl Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -85,11 +85,7 @@ static TAILQ_HEAD(svr4_sockcache_head, svr4_sockcache_entry) svr4_head; static int initialized = 0; struct sockaddr_un * -svr4_find_socket(p, fp, dev, ino) - struct proc *p; - struct file *fp; - dev_t dev; - svr4_ino_t ino; +svr4_find_socket(struct proc *p, struct file *fp, dev_t dev, svr4_ino_t ino) { struct svr4_sockcache_entry *e; void *cookie = ((struct socket *) fp->f_data)->so_internal; @@ -121,9 +117,7 @@ svr4_find_socket(p, fp, dev, ino) void -svr4_delete_socket(p, fp) - struct proc *p; - struct file *fp; +svr4_delete_socket(struct proc *p, struct file *fp) { struct svr4_sockcache_entry *e; void *cookie = ((struct socket *) fp->f_data)->so_internal; @@ -146,10 +140,7 @@ svr4_delete_socket(p, fp) int -svr4_add_socket(p, path, st) - struct proc *p; - const char *path; - struct stat *st; +svr4_add_socket(struct proc *p, const char *path, struct stat *st) { struct svr4_sockcache_entry *e; size_t len; @@ -184,10 +175,7 @@ svr4_add_socket(p, path, st) int -svr4_sys_socket(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_socket(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_socket_args *uap = v; diff --git a/sys/compat/svr4/svr4_sockio.c b/sys/compat/svr4/svr4_sockio.c index cdd591d3123..83561cc04a6 100644 --- a/sys/compat/svr4/svr4_sockio.c +++ b/sys/compat/svr4/svr4_sockio.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_sockio.c,v 1.32 2007/12/05 01:10:47 dyoung Exp $ */ +/* $NetBSD: svr4_sockio.c,v 1.33 2007/12/08 18:36:26 dsl Exp $ */ /*- * Copyright (c) 1995 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_sockio.c,v 1.32 2007/12/05 01:10:47 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_sockio.c,v 1.33 2007/12/08 18:36:26 dsl Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -73,8 +73,7 @@ static int bsd_to_svr4_flags(int); if (bf & __CONCAT(I,a)) sf |= __CONCAT(SVR4_I,a) static int -bsd_to_svr4_flags(bf) - int bf; +bsd_to_svr4_flags(int bf) { int sf = 0; bsd_to_svr4_flag(FF_UP); diff --git a/sys/compat/svr4/svr4_stat.c b/sys/compat/svr4/svr4_stat.c index dbb83b4b380..0dea06d5e03 100644 --- a/sys/compat/svr4/svr4_stat.c +++ b/sys/compat/svr4/svr4_stat.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_stat.c,v 1.64 2007/12/04 18:40:24 dsl Exp $ */ +/* $NetBSD: svr4_stat.c,v 1.65 2007/12/08 18:36:26 dsl Exp $ */ /*- * Copyright (c) 1994 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_stat.c,v 1.64 2007/12/04 18:40:24 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_stat.c,v 1.65 2007/12/08 18:36:26 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -99,9 +99,7 @@ static int svr4_to_bsd_pathconf(int); static void bsd_to_svr4_stat(struct stat *, struct svr4_stat *); static void -bsd_to_svr4_stat(st, st4) - struct stat *st; - struct svr4_stat *st4; +bsd_to_svr4_stat(struct stat *st, struct svr4_stat *st4) { memset(st4, 0, sizeof(*st4)); st4->st_dev = bsd_to_svr4_odev_t(st->st_dev); @@ -120,9 +118,7 @@ bsd_to_svr4_stat(st, st4) static void -bsd_to_svr4_xstat(st, st4) - struct stat *st; - struct svr4_xstat *st4; +bsd_to_svr4_xstat(struct stat *st, struct svr4_xstat *st4) { memset(st4, 0, sizeof(*st4)); st4->st_dev = bsd_to_svr4_dev_t(st->st_dev); @@ -146,9 +142,7 @@ bsd_to_svr4_xstat(st, st4) static void -bsd_to_svr4_stat64(st, st4) - struct stat *st; - struct svr4_stat64 *st4; +bsd_to_svr4_stat64(struct stat *st, struct svr4_stat64 *st4) { memset(st4, 0, sizeof(*st4)); st4->st_dev = bsd_to_svr4_dev_t(st->st_dev); @@ -172,10 +166,7 @@ bsd_to_svr4_stat64(st, st4) int -svr4_sys_stat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_stat(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_stat_args *uap = v; #ifdef SVR4_NO_OSTAT @@ -205,10 +196,7 @@ svr4_sys_stat(l, v, retval) int -svr4_sys_lstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_lstat(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_lstat_args *uap = v; #ifdef SVR4_NO_OSTAT @@ -238,10 +226,7 @@ svr4_sys_lstat(l, v, retval) int -svr4_sys_fstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_fstat(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_fstat_args *uap = v; #ifdef SVR4_NO_OSTAT @@ -268,10 +253,7 @@ svr4_sys_fstat(l, v, retval) int -svr4_sys_xstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_xstat(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_xstat_args *uap = v; struct stat st; @@ -292,10 +274,7 @@ svr4_sys_xstat(l, v, retval) int -svr4_sys_lxstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_lxstat(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_lxstat_args *uap = v; struct stat st; @@ -316,10 +295,7 @@ svr4_sys_lxstat(l, v, retval) int -svr4_sys_fxstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_fxstat(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_fxstat_args *uap = v; struct stat st; @@ -337,10 +313,7 @@ svr4_sys_fxstat(l, v, retval) int -svr4_sys_stat64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_stat64(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_stat64_args *uap = v; struct stat st; @@ -361,10 +334,7 @@ svr4_sys_stat64(l, v, retval) int -svr4_sys_lstat64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_lstat64(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_lstat64_args *uap = v; struct stat st; @@ -385,10 +355,7 @@ svr4_sys_lstat64(l, v, retval) int -svr4_sys_fstat64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_fstat64(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_fstat64_args *uap = v; struct svr4_stat64 svr4_st; @@ -465,10 +432,7 @@ svr4_sys_uname(struct lwp *l, void *v, register_t *retval) int -svr4_sys_systeminfo(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_systeminfo(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_systeminfo_args *uap = v; const char *str = NULL; @@ -598,10 +562,7 @@ svr4_sys_systeminfo(l, v, retval) int -svr4_sys_utssys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_utssys(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_utssys_args *uap = v; @@ -631,10 +592,7 @@ svr4_sys_utssys(l, v, retval) int -svr4_sys_utime(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_utime(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_utime_args *uap = v; struct svr4_utimbuf ub; @@ -658,18 +616,14 @@ svr4_sys_utime(l, v, retval) int -svr4_sys_utimes(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_utimes(struct lwp *l, void *v, register_t *retval) { return sys_utimes(l, v, retval); } static int -svr4_to_bsd_pathconf(name) - int name; +svr4_to_bsd_pathconf(int name) { switch (name) { case SVR4_PC_LINK_MAX: @@ -718,10 +672,7 @@ svr4_to_bsd_pathconf(name) int -svr4_sys_pathconf(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_pathconf(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_pathconf_args *uap = v; @@ -741,10 +692,7 @@ svr4_sys_pathconf(l, v, retval) int -svr4_sys_fpathconf(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_fpathconf(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_fpathconf_args *uap = v; diff --git a/sys/compat/svr4/svr4_stream.c b/sys/compat/svr4/svr4_stream.c index 08ea5396154..cf038bf44fc 100644 --- a/sys/compat/svr4/svr4_stream.c +++ b/sys/compat/svr4/svr4_stream.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_stream.c,v 1.70 2007/12/04 18:40:24 dsl Exp $ */ +/* $NetBSD: svr4_stream.c,v 1.71 2007/12/08 18:36:26 dsl Exp $ */ /*- * Copyright (c) 1994 The NetBSD Foundation, Inc. @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_stream.c,v 1.70 2007/12/04 18:40:24 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_stream.c,v 1.71 2007/12/08 18:36:26 dsl Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -184,9 +184,7 @@ static void show_msg(const char *, int, struct svr4_strbuf *, struct svr4_strbuf *, int); static void -bufprint(buf, len) - u_char *buf; - size_t len; +bufprint(u_char *buf, size_t len) { size_t i; @@ -199,9 +197,7 @@ bufprint(buf, len) } static int -show_ioc(str, ioc) - const char *str; - struct svr4_strioctl *ioc; +show_ioc(const char *str, struct svr4_strioctl *ioc) { u_char *ptr; int error, len; @@ -229,8 +225,7 @@ show_ioc(str, ioc) static int -show_strbuf(str) - struct svr4_strbuf *str; +show_strbuf(struct svr4_strbuf *str) { int error; u_char *ptr = NULL; @@ -270,12 +265,7 @@ show_strbuf(str) static void -show_msg(str, fd, ctl, dat, flags) - const char *str; - int fd; - struct svr4_strbuf *ctl; - struct svr4_strbuf *dat; - int flags; +show_msg(const char *str, int fd, struct svr4_strbuf *ctl, struct svr4_strbuf *dat, int flags) { struct svr4_strbuf buf; int error; @@ -314,9 +304,7 @@ show_msg(str, fd, ctl, dat, flags) * using this as a random file removal tool. */ static int -clean_pipe(l, path) - struct lwp *l; - const char *path; +clean_pipe(struct lwp *l, const char *path) { struct nameidata nd; struct vattr va; @@ -353,9 +341,7 @@ clean_pipe(l, path) static void -sockaddr_to_netaddr_in(sc, sain) - struct svr4_strmcmd *sc; - const struct sockaddr_in *sain; +sockaddr_to_netaddr_in(struct svr4_strmcmd *sc, const struct sockaddr_in *sain) { struct svr4_netaddr_in *na; na = SVR4_ADDROF(sc); @@ -369,9 +355,7 @@ sockaddr_to_netaddr_in(sc, sain) static void -sockaddr_to_netaddr_un(sc, saun) - struct svr4_strmcmd *sc; - const struct sockaddr_un *saun; +sockaddr_to_netaddr_un(struct svr4_strmcmd *sc, const struct sockaddr_un *saun) { struct svr4_netaddr_un *na; char *dst, *edst = ((char *) sc) + sc->offs + sizeof(na->family) + 1 - @@ -388,9 +372,7 @@ sockaddr_to_netaddr_un(sc, saun) static void -netaddr_to_sockaddr_in(sain, sc) - struct sockaddr_in *sain; - const struct svr4_strmcmd *sc; +netaddr_to_sockaddr_in(struct sockaddr_in *sain, const struct svr4_strmcmd *sc) { const struct svr4_netaddr_in *na; @@ -407,9 +389,7 @@ netaddr_to_sockaddr_in(sain, sc) static void -netaddr_to_sockaddr_un(saun, sc) - struct sockaddr_un *saun; - const struct svr4_strmcmd *sc; +netaddr_to_sockaddr_un(struct sockaddr_un *saun, const struct svr4_strmcmd *sc) { const struct svr4_netaddr_un *na; char *dst, *edst = &saun->sun_path[sizeof(saun->sun_path) - 1]; @@ -428,9 +408,7 @@ netaddr_to_sockaddr_un(saun, sc) static void -getparm(fp, pa) - struct file *fp; - struct svr4_si_sockparms *pa; +getparm(struct file *fp, struct svr4_si_sockparms *pa) { struct svr4_strm *st = svr4_stream_get(fp); struct socket *so = (struct socket *) fp->f_data; @@ -535,11 +513,7 @@ si_sockparams(struct file *fp, int fd, struct svr4_strioctl *ioc, static int -si_listen(fp, fd, ioc, l) - struct file *fp; - int fd; - struct svr4_strioctl *ioc; - struct lwp *l; +si_listen(struct file *fp, int fd, struct svr4_strioctl *ioc, struct lwp *l) { int error; struct svr4_strm *st = svr4_stream_get(fp); @@ -680,11 +654,7 @@ si_shutdown(struct file *fp, int fd, struct svr4_strioctl *ioc, static int -sockmod(fp, fd, ioc, l) - struct file *fp; - int fd; - struct svr4_strioctl *ioc; - struct lwp *l; +sockmod(struct file *fp, int fd, struct svr4_strioctl *ioc, struct lwp *l) { switch (ioc->cmd) { case SVR4_SI_OGETUDATA: @@ -774,11 +744,7 @@ ti_getinfo(struct file *fp, int fd, struct svr4_strioctl *ioc, static int -ti_bind(fp, fd, ioc, l) - struct file *fp; - int fd; - struct svr4_strioctl *ioc; - struct lwp *l; +ti_bind(struct file *fp, int fd, struct svr4_strioctl *ioc, struct lwp *l) { int error; struct svr4_strm *st = svr4_stream_get(fp); @@ -877,11 +843,7 @@ reply: static int -timod(fp, fd, ioc, l) - struct file *fp; - int fd; - struct svr4_strioctl *ioc; - struct lwp *l; +timod(struct file *fp, int fd, struct svr4_strioctl *ioc, struct lwp *l) { switch (ioc->cmd) { case SVR4_TI_GETINFO: @@ -908,13 +870,7 @@ timod(fp, fd, ioc, l) int -svr4_stream_ti_ioctl(fp, l, retval, fd, cmd, dat) - struct file *fp; - struct lwp *l; - register_t *retval; - int fd; - u_long cmd; - void *dat; +svr4_stream_ti_ioctl(struct file *fp, struct lwp *l, register_t *retval, int fd, u_long cmd, void *dat) { struct svr4_strbuf skb, *sub = (struct svr4_strbuf *) dat; struct svr4_strm *st = svr4_stream_get(fp); @@ -1244,13 +1200,7 @@ i_getsig(struct file *fp, struct lwp *l, register_t *retval, } int -svr4_stream_ioctl(fp, l, retval, fd, cmd, dat) - struct file *fp; - struct lwp *l; - register_t *retval; - int fd; - u_long cmd; - void *dat; +svr4_stream_ioctl(struct file *fp, struct lwp *l, register_t *retval, int fd, u_long cmd, void *dat) { *retval = 0; @@ -1419,10 +1369,7 @@ svr4_stream_ioctl(fp, l, retval, fd, cmd, dat) int -svr4_sys_putmsg(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_putmsg(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_putmsg_args *uap = v; struct proc *p = l->l_proc; @@ -1586,10 +1533,7 @@ svr4_sys_putmsg(l, v, retval) int -svr4_sys_getmsg(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_sys_getmsg(struct lwp *l, void *v, register_t *retval) { struct svr4_sys_getmsg_args *uap = v; struct proc *p = l->l_proc; diff --git a/sys/compat/svr4/svr4_termios.c b/sys/compat/svr4/svr4_termios.c index a9c23f07732..17e2b82b318 100644 --- a/sys/compat/svr4/svr4_termios.c +++ b/sys/compat/svr4/svr4_termios.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_termios.c,v 1.24 2007/12/04 18:40:24 dsl Exp $ */ +/* $NetBSD: svr4_termios.c,v 1.25 2007/12/08 18:36:26 dsl Exp $ */ /*- * Copyright (c) 1994 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_termios.c,v 1.24 2007/12/04 18:40:24 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_termios.c,v 1.25 2007/12/08 18:36:26 dsl Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -160,8 +160,7 @@ static void print_bsd_termios(const struct termios *); #ifdef DEBUG_SVR4 static void -print_svr4_termios(st) - const struct svr4_termios *st; +print_svr4_termios(const struct svr4_termios *st) { int i; uprintf("SVR4\niflag=%lo oflag=%lo cflag=%lo lflag=%lo\n", @@ -174,8 +173,7 @@ print_svr4_termios(st) static void -print_bsd_termios(bt) - const struct termios *bt; +print_bsd_termios(const struct termios *bt) { int i; uprintf("BSD\niflag=%o oflag=%o cflag=%o lflag=%o\n", @@ -188,9 +186,7 @@ print_bsd_termios(bt) #endif /* DEBUG_SVR4 */ static u_long -bsd_to_svr4_speed(sp, mask) - u_long sp; - u_long mask; +bsd_to_svr4_speed(u_long sp, u_long mask) { switch (sp) { #undef getval @@ -226,9 +222,7 @@ bsd_to_svr4_speed(sp, mask) static u_long -svr4_to_bsd_speed(sp, mask) - u_long sp; - u_long mask; +svr4_to_bsd_speed(u_long sp, u_long mask) { while ((mask & 1) == 0) { mask >>= 1; @@ -262,10 +256,7 @@ svr4_to_bsd_speed(sp, mask) static void -svr4_to_bsd_termios(st, bt, new) - const struct svr4_termios *st; - struct termios *bt; - int new; +svr4_to_bsd_termios(const struct svr4_termios *st, struct termios *bt, int new) { /* control characters */ /* @@ -364,9 +355,7 @@ svr4_to_bsd_termios(st, bt, new) static void -bsd_to_svr4_termios(bt, st) - const struct termios *bt; - struct svr4_termios *st; +bsd_to_svr4_termios(const struct termios *bt, struct svr4_termios *st) { /* control characters */ /* @@ -467,9 +456,7 @@ bsd_to_svr4_termios(bt, st) static void -svr4_termio_to_termios(t, ts) - const struct svr4_termio *t; - struct svr4_termios *ts; +svr4_termio_to_termios(const struct svr4_termio *t, struct svr4_termios *ts) { int i; @@ -484,9 +471,7 @@ svr4_termio_to_termios(t, ts) static void -svr4_termios_to_termio(ts, t) - const struct svr4_termios *ts; - struct svr4_termio *t; +svr4_termios_to_termio(const struct svr4_termios *ts, struct svr4_termio *t) { int i; @@ -501,13 +486,7 @@ svr4_termios_to_termio(ts, t) } int -svr4_term_ioctl(fp, l, retval, fd, cmd, data) - struct file *fp; - struct lwp *l; - register_t *retval; - int fd; - u_long cmd; - void *data; +svr4_term_ioctl(struct file *fp, struct lwp *l, register_t *retval, int fd, u_long cmd, void *data) { struct termios bt; struct svr4_termios st; diff --git a/sys/compat/svr4/svr4_ttold.c b/sys/compat/svr4/svr4_ttold.c index 9d21c4f4de6..cf1b23ff60f 100644 --- a/sys/compat/svr4/svr4_ttold.c +++ b/sys/compat/svr4/svr4_ttold.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_ttold.c,v 1.30 2007/12/04 18:40:24 dsl Exp $ */ +/* $NetBSD: svr4_ttold.c,v 1.31 2007/12/08 18:36:26 dsl Exp $ */ /*- * Copyright (c) 1994 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_ttold.c,v 1.30 2007/12/04 18:40:24 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_ttold.c,v 1.31 2007/12/08 18:36:26 dsl Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -85,9 +85,7 @@ static void print_svr4_tchars(const char *, struct svr4_tchars *); static void print_svr4_ltchars(const char *, struct svr4_ltchars *); static void -print_svr4_sgttyb(str, ss) - const char *str; - struct svr4_sgttyb *ss; +print_svr4_sgttyb(const char *str, struct svr4_sgttyb *ss) { uprintf("%s\nispeed=%o ospeed=%o ", str, ss->sg_ispeed, ss->sg_ospeed); @@ -96,9 +94,7 @@ print_svr4_sgttyb(str, ss) } static void -print_svr4_tchars(str, st) - const char *str; - struct svr4_tchars *st; +print_svr4_tchars(const char *str, struct svr4_tchars *st) { uprintf("%s\nintrc=%o quitc=%o ", str, st->t_intrc, st->t_quitc); uprintf("startc=%o stopc=%o eofc=%o brkc=%o\n", st->t_startc, @@ -106,9 +102,7 @@ print_svr4_tchars(str, st) } static void -print_svr4_ltchars(str, sl) - const char *str; - struct svr4_ltchars *sl; +print_svr4_ltchars(const char *str, struct svr4_ltchars *sl) { uprintf("%s\nsuspc=%o dsuspc=%o ", str, sl->t_suspc, sl->t_dsuspc); uprintf("rprntc=%o flushc=%o werasc=%o lnextc=%o\n", sl->t_rprntc, @@ -117,9 +111,7 @@ print_svr4_ltchars(str, sl) #endif /* DEBUG_SVR4 */ static void -svr4_tchars_to_bsd_tchars(st, bt) - const struct svr4_tchars *st; - struct tchars *bt; +svr4_tchars_to_bsd_tchars(const struct svr4_tchars *st, struct tchars *bt) { bt->t_intrc = st->t_intrc; bt->t_quitc = st->t_quitc; @@ -131,9 +123,7 @@ svr4_tchars_to_bsd_tchars(st, bt) static void -bsd_tchars_to_svr4_tchars(bt, st) - const struct tchars *bt; - struct svr4_tchars *st; +bsd_tchars_to_svr4_tchars(const struct tchars *bt, struct svr4_tchars *st) { st->t_intrc = bt->t_intrc; st->t_quitc = bt->t_quitc; @@ -145,9 +135,7 @@ bsd_tchars_to_svr4_tchars(bt, st) static void -svr4_sgttyb_to_bsd_sgttyb(ss, bs) - const struct svr4_sgttyb *ss; - struct sgttyb *bs; +svr4_sgttyb_to_bsd_sgttyb(const struct svr4_sgttyb *ss, struct sgttyb *bs) { bs->sg_ispeed = ss->sg_ispeed; bs->sg_ospeed = ss->sg_ospeed; @@ -158,9 +146,7 @@ svr4_sgttyb_to_bsd_sgttyb(ss, bs) static void -bsd_sgttyb_to_svr4_sgttyb(bs, ss) - const struct sgttyb *bs; - struct svr4_sgttyb *ss; +bsd_sgttyb_to_svr4_sgttyb(const struct sgttyb *bs, struct svr4_sgttyb *ss) { ss->sg_ispeed = bs->sg_ispeed; ss->sg_ospeed = bs->sg_ospeed; @@ -171,9 +157,7 @@ bsd_sgttyb_to_svr4_sgttyb(bs, ss) static void -svr4_ltchars_to_bsd_ltchars(sl, bl) - const struct svr4_ltchars *sl; - struct ltchars *bl; +svr4_ltchars_to_bsd_ltchars(const struct svr4_ltchars *sl, struct ltchars *bl) { bl->t_suspc = sl->t_suspc; bl->t_dsuspc = sl->t_dsuspc; @@ -185,9 +169,7 @@ svr4_ltchars_to_bsd_ltchars(sl, bl) static void -bsd_ltchars_to_svr4_ltchars(bl, sl) - const struct ltchars *bl; - struct svr4_ltchars *sl; +bsd_ltchars_to_svr4_ltchars(const struct ltchars *bl, struct svr4_ltchars *sl) { sl->t_suspc = bl->t_suspc; sl->t_dsuspc = bl->t_dsuspc; diff --git a/sys/compat/svr4_32/svr4_32_exec_elf32.c b/sys/compat/svr4_32/svr4_32_exec_elf32.c index 7af1a6fa27f..22f351a5633 100644 --- a/sys/compat/svr4_32/svr4_32_exec_elf32.c +++ b/sys/compat/svr4_32/svr4_32_exec_elf32.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_32_exec_elf32.c,v 1.18 2007/10/19 12:16:40 ad Exp $ */ +/* $NetBSD: svr4_32_exec_elf32.c,v 1.19 2007/12/08 18:36:27 dsl Exp $ */ /*- * Copyright (c) 1994 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_32_exec_elf32.c,v 1.18 2007/10/19 12:16:40 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_32_exec_elf32.c,v 1.19 2007/12/08 18:36:27 dsl Exp $"); #define ELFSIZE 32 /* XXX should die */ @@ -76,12 +76,7 @@ int sun_hwcap = (AV_SPARC_HWMUL_32x32|AV_SPARC_HWDIV_32x32|AV_SPARC_HWFSMULD); #if 0 int -svr4_32_copyargs(l, pack, arginfo, stackp, argp) - struct lwp *l; - struct exec_package *pack; - struct ps_strings *arginfo; - char **stackp; - void *argp; +svr4_32_copyargs(struct lwp *l, struct exec_package *pack, struct ps_strings *arginfo, char **stackp, void *argp) { size_t len; AuxInfo ai[SVR4_32_AUX_ARGSIZ], *a, *platform=NULL, *exec=NULL; @@ -204,12 +199,7 @@ svr4_32_copyargs(l, pack, arginfo, stackp, argp) } #else int -svr4_32_copyargs(l, pack, arginfo, stackp, argp) - struct lwp *l; - struct exec_package *pack; - struct ps_strings *arginfo; - char **stackp; - void *argp; +svr4_32_copyargs(struct lwp *l, struct exec_package *pack, struct ps_strings *arginfo, char **stackp, void *argp) { size_t len; AuxInfo ai[SVR4_32_AUX_ARGSIZ], *a; @@ -275,12 +265,7 @@ svr4_32_copyargs(l, pack, arginfo, stackp, argp) #endif int -svr4_32_elf32_probe(l, epp, eh, itp, pos) - struct lwp *l; - struct exec_package *epp; - void *eh; - char *itp; - vaddr_t *pos; +svr4_32_elf32_probe(struct lwp *l, struct exec_package *epp, void *eh, char *itp, vaddr_t *pos) { int error; diff --git a/sys/compat/svr4_32/svr4_32_fcntl.c b/sys/compat/svr4_32/svr4_32_fcntl.c index 7c01ae6d8e1..09d9071128b 100644 --- a/sys/compat/svr4_32/svr4_32_fcntl.c +++ b/sys/compat/svr4_32/svr4_32_fcntl.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_32_fcntl.c,v 1.26 2007/12/04 18:40:25 dsl Exp $ */ +/* $NetBSD: svr4_32_fcntl.c,v 1.27 2007/12/08 18:36:27 dsl Exp $ */ /*- * Copyright (c) 1994, 1997 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_32_fcntl.c,v 1.26 2007/12/04 18:40:25 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_32_fcntl.c,v 1.27 2007/12/08 18:36:27 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -74,8 +74,7 @@ static int fd_truncate(struct lwp *, int, struct flock *, register_t *); static int -svr4_32_to_bsd_flags(l) - int l; +svr4_32_to_bsd_flags(int l) { int r = 0; r |= (l & SVR4_O_RDONLY) ? O_RDONLY : 0; @@ -97,8 +96,7 @@ svr4_32_to_bsd_flags(l) static int -bsd_to_svr4_32_flags(l) - int l; +bsd_to_svr4_32_flags(int l) { int r = 0; r |= (l & O_RDONLY) ? SVR4_O_RDONLY : 0; @@ -120,9 +118,7 @@ bsd_to_svr4_32_flags(l) static void -bsd_to_svr4_32_flock(iflp, oflp) - struct flock *iflp; - struct svr4_32_flock *oflp; +bsd_to_svr4_32_flock(struct flock *iflp, struct svr4_32_flock *oflp) { switch (iflp->l_type) { case F_RDLCK: @@ -148,9 +144,7 @@ bsd_to_svr4_32_flock(iflp, oflp) static void -svr4_32_to_bsd_flock(iflp, oflp) - struct svr4_32_flock *iflp; - struct flock *oflp; +svr4_32_to_bsd_flock(struct svr4_32_flock *iflp, struct flock *oflp) { switch (iflp->l_type) { case SVR4_F_RDLCK: @@ -175,9 +169,7 @@ svr4_32_to_bsd_flock(iflp, oflp) } static void -bsd_to_svr4_32_flock64(iflp, oflp) - struct flock *iflp; - struct svr4_32_flock64 *oflp; +bsd_to_svr4_32_flock64(struct flock *iflp, struct svr4_32_flock64 *oflp) { switch (iflp->l_type) { case F_RDLCK: @@ -203,9 +195,7 @@ bsd_to_svr4_32_flock64(iflp, oflp) static void -svr4_32_to_bsd_flock64(iflp, oflp) - struct svr4_32_flock64 *iflp; - struct flock *oflp; +svr4_32_to_bsd_flock64(struct svr4_32_flock64 *iflp, struct flock *oflp) { switch (iflp->l_type) { case SVR4_F_RDLCK: @@ -273,11 +263,7 @@ out: static int -fd_truncate(l, fd, flp, retval) - struct lwp *l; - int fd; - struct flock *flp; - register_t *retval; +fd_truncate(struct lwp *l, int fd, struct flock *flp, register_t *retval) { struct filedesc *fdp = l->l_proc->p_fd; struct file *fp; @@ -340,10 +326,7 @@ fd_truncate(l, fd, flp, retval) int -svr4_32_sys_open(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_open(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_open_args *uap = v; int error; @@ -380,20 +363,14 @@ svr4_32_sys_open(l, v, retval) int -svr4_32_sys_open64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_open64(struct lwp *l, void *v, register_t *retval) { return svr4_32_sys_open(l, v, retval); } int -svr4_32_sys_creat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_creat(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_creat_args *uap = v; struct sys_open_args cup; @@ -407,20 +384,14 @@ svr4_32_sys_creat(l, v, retval) int -svr4_32_sys_creat64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_creat64(struct lwp *l, void *v, register_t *retval) { return svr4_32_sys_creat(l, v, retval); } int -svr4_32_sys_llseek(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_llseek(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_llseek_args *uap = v; struct sys_lseek_args ap; @@ -440,10 +411,7 @@ svr4_32_sys_llseek(l, v, retval) } int -svr4_32_sys_access(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_access(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_access_args *uap = v; struct sys_access_args cup; @@ -456,10 +424,7 @@ svr4_32_sys_access(l, v, retval) int -svr4_32_sys_pread(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_pread(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_pread_args *uap = v; struct sys_pread_args pra; @@ -478,10 +443,7 @@ svr4_32_sys_pread(l, v, retval) int -svr4_32_sys_pread64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_pread64(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_pread64_args *uap = v; @@ -501,10 +463,7 @@ svr4_32_sys_pread64(l, v, retval) int -svr4_32_sys_pwrite(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_pwrite(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_pwrite_args *uap = v; struct sys_pwrite_args pwa; @@ -523,10 +482,7 @@ svr4_32_sys_pwrite(l, v, retval) int -svr4_32_sys_pwrite64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_pwrite64(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_pwrite64_args *uap = v; struct sys_pwrite_args pwa; @@ -545,10 +501,7 @@ svr4_32_sys_pwrite64(l, v, retval) int -svr4_32_sys_fcntl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_fcntl(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_fcntl_args *uap = v; struct sys_fcntl_args fa; diff --git a/sys/compat/svr4_32/svr4_32_filio.c b/sys/compat/svr4_32/svr4_32_filio.c index 3b92dc4da8a..d29eb9674af 100644 --- a/sys/compat/svr4_32/svr4_32_filio.c +++ b/sys/compat/svr4_32/svr4_32_filio.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_32_filio.c,v 1.11 2007/03/04 06:01:36 christos Exp $ */ +/* $NetBSD: svr4_32_filio.c,v 1.12 2007/12/08 18:36:27 dsl Exp $ */ /*- * Copyright (c) 1994 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_32_filio.c,v 1.11 2007/03/04 06:01:36 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_32_filio.c,v 1.12 2007/12/08 18:36:27 dsl Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -66,13 +66,7 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_32_filio.c,v 1.11 2007/03/04 06:01:36 christos int -svr4_32_fil_ioctl(fp, l, retval, fd, cmd, data) - struct file *fp; - struct lwp *l; - register_t *retval; - int fd; - u_long cmd; - void *data; +svr4_32_fil_ioctl(struct file *fp, struct lwp *l, register_t *retval, int fd, u_long cmd, void *data) { int error; int num; diff --git a/sys/compat/svr4_32/svr4_32_ioctl.c b/sys/compat/svr4_32/svr4_32_ioctl.c index d53486b0928..24347d7e10c 100644 --- a/sys/compat/svr4_32/svr4_32_ioctl.c +++ b/sys/compat/svr4_32/svr4_32_ioctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_32_ioctl.c,v 1.16 2007/12/04 18:40:25 dsl Exp $ */ +/* $NetBSD: svr4_32_ioctl.c,v 1.17 2007/12/08 18:36:27 dsl Exp $ */ /*- * Copyright (c) 1994 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_32_ioctl.c,v 1.16 2007/12/04 18:40:25 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_32_ioctl.c,v 1.17 2007/12/08 18:36:27 dsl Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -99,10 +99,7 @@ svr4_32_decode_cmd(cmd, dir, c, num, argsiz) #endif int -svr4_32_sys_ioctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_ioctl(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_ioctl_args *uap = v; struct proc *p = l->l_proc; diff --git a/sys/compat/svr4_32/svr4_32_ipc.c b/sys/compat/svr4_32/svr4_32_ipc.c index b758271f095..26282451370 100644 --- a/sys/compat/svr4_32/svr4_32_ipc.c +++ b/sys/compat/svr4_32/svr4_32_ipc.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_32_ipc.c,v 1.17 2007/12/04 18:40:25 dsl Exp $ */ +/* $NetBSD: svr4_32_ipc.c,v 1.18 2007/12/08 18:36:27 dsl Exp $ */ /*- * Copyright (c) 1995 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_32_ipc.c,v 1.17 2007/12/04 18:40:25 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_32_ipc.c,v 1.18 2007/12/08 18:36:27 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_sysv.h" @@ -109,9 +109,7 @@ static int svr4_32_shmctl(struct lwp *, void *, register_t *); #if defined(SYSVMSG) || defined(SYSVSHM) || defined(SYSVSEM) static void -svr4_32_to_bsd_ipc_perm(spp, bpp) - const struct svr4_32_ipc_perm *spp; - struct ipc_perm *bpp; +svr4_32_to_bsd_ipc_perm(const struct svr4_32_ipc_perm *spp, struct ipc_perm *bpp) { bpp->_key = spp->key; bpp->uid = spp->uid; @@ -123,9 +121,7 @@ svr4_32_to_bsd_ipc_perm(spp, bpp) } static void -bsd_to_svr4_32_ipc_perm(bpp, spp) - const struct ipc_perm *bpp; - struct svr4_32_ipc_perm *spp; +bsd_to_svr4_32_ipc_perm(const struct ipc_perm *bpp, struct svr4_32_ipc_perm *spp) { spp->key = bpp->_key; spp->uid = bpp->uid; @@ -139,9 +135,7 @@ bsd_to_svr4_32_ipc_perm(bpp, spp) #ifdef SYSVSEM static void -bsd_to_svr4_32_semid_ds(bds, sds) - const struct semid_ds *bds; - struct svr4_32_semid_ds *sds; +bsd_to_svr4_32_semid_ds(const struct semid_ds *bds, struct svr4_32_semid_ds *sds) { bsd_to_svr4_32_ipc_perm(&bds->sem_perm, &sds->sem_perm); NETBSD32PTR32(sds->sem_base, bds->_sem_base); @@ -151,9 +145,7 @@ bsd_to_svr4_32_semid_ds(bds, sds) } static void -svr4_32_to_bsd_semid_ds(sds, bds) - const struct svr4_32_semid_ds *sds; - struct semid_ds *bds; +svr4_32_to_bsd_semid_ds(const struct svr4_32_semid_ds *sds, struct semid_ds *bds) { svr4_32_to_bsd_ipc_perm(&sds->sem_perm, &bds->sem_perm); bds->_sem_base = NETBSD32PTR64(sds->sem_base); @@ -171,10 +163,7 @@ struct svr4_32_sys_semctl_args { }; static int -svr4_32_semctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_semctl(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_semctl_args *uap = v; struct semid_ds sembuf; @@ -262,10 +251,7 @@ struct svr4_32_sys_semget_args { }; static int -svr4_32_semget(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_semget(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_semget_args *uap = v; struct sys_semget_args ap; @@ -285,10 +271,7 @@ struct svr4_32_sys_semop_args { }; static int -svr4_32_semop(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_semop(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_semop_args *uap = v; struct sys_semop_args ap; @@ -302,10 +285,7 @@ svr4_32_semop(l, v, retval) } int -svr4_32_sys_semsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_semsys(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_semsys_args *uap = v; @@ -326,9 +306,7 @@ svr4_32_sys_semsys(l, v, retval) #ifdef SYSVMSG static void -bsd_to_svr4_32_msqid_ds(bds, sds) - const struct msqid_ds *bds; - struct svr4_32_msqid_ds *sds; +bsd_to_svr4_32_msqid_ds(const struct msqid_ds *bds, struct svr4_32_msqid_ds *sds) { bsd_to_svr4_32_ipc_perm(&bds->msg_perm, &sds->msg_perm); NETBSD32PTR32(sds->msg_first, bds->_msg_first); @@ -350,9 +328,7 @@ bsd_to_svr4_32_msqid_ds(bds, sds) } static void -svr4_32_to_bsd_msqid_ds(sds, bds) - const struct svr4_32_msqid_ds *sds; - struct msqid_ds *bds; +svr4_32_to_bsd_msqid_ds(const struct svr4_32_msqid_ds *sds, struct msqid_ds *bds) { svr4_32_to_bsd_ipc_perm(&sds->msg_perm, &bds->msg_perm); bds->_msg_first = NETBSD32PTR64(sds->msg_first); @@ -381,10 +357,7 @@ struct svr4_32_sys_msgsnd_args { }; static int -svr4_32_msgsnd(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_msgsnd(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_msgsnd_args *uap = v; struct sys_msgsnd_args ap; @@ -407,10 +380,7 @@ struct svr4_32_sys_msgrcv_args { }; static int -svr4_32_msgrcv(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_msgrcv(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_msgrcv_args *uap = v; struct sys_msgrcv_args ap; @@ -431,10 +401,7 @@ struct svr4_32_sys_msgget_args { }; static int -svr4_32_msgget(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_msgget(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_msgget_args *uap = v; struct sys_msgget_args ap; @@ -453,10 +420,7 @@ struct svr4_32_sys_msgctl_args { }; static int -svr4_32_msgctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_msgctl(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_msgctl_args *uap = v; struct svr4_32_msqid_ds ss; @@ -488,10 +452,7 @@ svr4_32_msgctl(l, v, retval) } int -svr4_32_sys_msgsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_msgsys(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_msgsys_args *uap = v; @@ -515,9 +476,7 @@ svr4_32_sys_msgsys(l, v, retval) #ifdef SYSVSHM static void -bsd_to_svr4_32_shmid_ds(bds, sds) - const struct shmid_ds *bds; - struct svr4_32_shmid_ds *sds; +bsd_to_svr4_32_shmid_ds(const struct shmid_ds *bds, struct svr4_32_shmid_ds *sds) { bsd_to_svr4_32_ipc_perm(&bds->shm_perm, &sds->shm_perm); sds->shm_segsz = bds->shm_segsz; @@ -536,9 +495,7 @@ bsd_to_svr4_32_shmid_ds(bds, sds) } static void -svr4_32_to_bsd_shmid_ds(sds, bds) - const struct svr4_32_shmid_ds *sds; - struct shmid_ds *bds; +svr4_32_to_bsd_shmid_ds(const struct svr4_32_shmid_ds *sds, struct shmid_ds *bds) { svr4_32_to_bsd_ipc_perm(&sds->shm_perm, &bds->shm_perm); bds->shm_segsz = sds->shm_segsz; @@ -559,10 +516,7 @@ struct svr4_32_sys_shmat_args { }; static int -svr4_32_shmat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_shmat(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_shmat_args *uap = v; struct sys_shmat_args ap; @@ -580,10 +534,7 @@ struct svr4_32_sys_shmdt_args { }; static int -svr4_32_shmdt(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_shmdt(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_shmdt_args *uap = v; struct sys_shmdt_args ap; @@ -601,10 +552,7 @@ struct svr4_32_sys_shmget_args { }; static int -svr4_32_shmget(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_shmget(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_shmget_args *uap = v; struct sys_shmget_args ap; @@ -624,10 +572,7 @@ struct svr4_32_sys_shmctl_args { }; int -svr4_32_shmctl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_shmctl(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_shmctl_args *uap = v; struct shmid_ds bs; @@ -665,10 +610,7 @@ svr4_32_shmctl(l, v, retval) } int -svr4_32_sys_shmsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_shmsys(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_shmsys_args *uap = v; diff --git a/sys/compat/svr4_32/svr4_32_lwp.c b/sys/compat/svr4_32/svr4_32_lwp.c index dce946cdddb..6752b1ff1c8 100644 --- a/sys/compat/svr4_32/svr4_32_lwp.c +++ b/sys/compat/svr4_32/svr4_32_lwp.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_32_lwp.c,v 1.12 2007/03/20 09:11:04 cube Exp $ */ +/* $NetBSD: svr4_32_lwp.c,v 1.13 2007/12/08 18:36:27 dsl Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_32_lwp.c,v 1.12 2007/03/20 09:11:04 cube Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_32_lwp.c,v 1.13 2007/12/08 18:36:27 dsl Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -68,10 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_32_lwp.c,v 1.12 2007/03/20 09:11:04 cube Exp $" #if 0 int -svr4_32_sys__lwp_self(p, v, retval) - struct proc *p; - void *v; - register_t *retval; +svr4_32_sys__lwp_self(struct proc *p, void *v, register_t *retval) { return sys_getpid(p, v, retval); } @@ -79,10 +76,7 @@ svr4_32_sys__lwp_self(p, v, retval) int -svr4_32_sys__lwp_create(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys__lwp_create(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys__lwp_create_args *uap = v; struct sys__lwp_create_args lc; @@ -111,10 +105,7 @@ svr4_32_sys__lwp_create(l, v, retval) } int -svr4_32_sys__lwp_kill(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys__lwp_kill(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys__lwp_kill_args *uap = v; struct sys_kill_args ap; @@ -125,10 +116,7 @@ svr4_32_sys__lwp_kill(l, v, retval) } int -svr4_32_sys__lwp_info(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys__lwp_info(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys__lwp_info_args *uap = v; struct proc *p = l->l_proc; @@ -145,20 +133,14 @@ svr4_32_sys__lwp_info(l, v, retval) } int -svr4_32_sys__lwp_exit(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys__lwp_exit(struct lwp *l, void *v, register_t *retval) { return sys__lwp_exit(l, NULL, retval); } int -svr4_32_sys__lwp_wait(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys__lwp_wait(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys__lwp_wait_args *uap = v; struct sys__lwp_wait_args ap; @@ -170,10 +152,7 @@ svr4_32_sys__lwp_wait(l, v, retval) } int -svr4_32_sys__lwp_suspend(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys__lwp_suspend(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys__lwp_suspend_args *uap = v; struct sys__lwp_suspend_args ap; @@ -184,10 +163,7 @@ svr4_32_sys__lwp_suspend(l, v, retval) } int -svr4_32_sys__lwp_continue(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys__lwp_continue(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys__lwp_continue_args *uap = v; struct sys__lwp_continue_args ap; @@ -198,10 +174,7 @@ svr4_32_sys__lwp_continue(l, v, retval) } int -svr4_32_sys__lwp_getprivate(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys__lwp_getprivate(struct lwp *l, void *v, register_t *retval) { /* XXX NJWLWP: Replace with call to native version if we ever * implement that. */ @@ -211,10 +184,7 @@ svr4_32_sys__lwp_getprivate(l, v, retval) } int -svr4_32_sys__lwp_setprivate(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys__lwp_setprivate(struct lwp *l, void *v, register_t *retval) { #if 0 struct svr4_32_sys__lwp_setprivate_args *uap = v; diff --git a/sys/compat/svr4_32/svr4_32_misc.c b/sys/compat/svr4_32/svr4_32_misc.c index a57ced64c98..781314ed029 100644 --- a/sys/compat/svr4_32/svr4_32_misc.c +++ b/sys/compat/svr4_32/svr4_32_misc.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_32_misc.c,v 1.52 2007/12/04 18:40:25 dsl Exp $ */ +/* $NetBSD: svr4_32_misc.c,v 1.53 2007/12/08 18:36:28 dsl Exp $ */ /*- * Copyright (c) 1994 The NetBSD Foundation, Inc. @@ -44,7 +44,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_32_misc.c,v 1.52 2007/12/04 18:40:25 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_32_misc.c,v 1.53 2007/12/08 18:36:28 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -116,10 +116,7 @@ static int svr4_32_mknod(struct lwp *, register_t *, const char *, svr4_32_mode_t, svr4_32_dev_t); int -svr4_32_sys_wait(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_wait(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_wait_args *uap = v; int error, was_zombie; @@ -155,10 +152,7 @@ svr4_32_sys_wait(l, v, retval) int -svr4_32_sys_execv(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_execv(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_execv_args /* { syscallarg(char *) path; @@ -179,10 +173,7 @@ svr4_32_sys_execv(l, v, retval) #if 0 int -svr4_32_sys_execve(p, v, retval) - struct proc *p; - void *v; - register_t *retval; +svr4_32_sys_execve(struct proc *p, void *v, register_t *retval) { struct svr4_32_sys_execve_args /* { syscallarg(const char *) path; @@ -200,10 +191,7 @@ svr4_32_sys_execve(p, v, retval) #endif int -svr4_32_sys_time(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_time(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_time_args *uap = v; int error = 0; @@ -230,10 +218,7 @@ svr4_32_sys_time(l, v, retval) * This is quite ugly, but what do you expect from compatibility code? */ int -svr4_32_sys_getdents64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_getdents64(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_getdents64_args *uap = v; struct proc *p = l->l_proc; @@ -355,10 +340,7 @@ out: int -svr4_32_sys_getdents(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_getdents(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_getdents_args *uap = v; struct proc *p = l->l_proc; @@ -481,8 +463,7 @@ out: static int -svr4_to_bsd_mmap_flags(f) - int f; +svr4_to_bsd_mmap_flags(int f) { int type = f & SVR4_MAP_TYPE; int nf; @@ -499,10 +480,7 @@ svr4_to_bsd_mmap_flags(f) int -svr4_32_sys_mmap(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_mmap(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_mmap_args *uap = v; struct sys_mmap_args mm; @@ -536,10 +514,7 @@ svr4_32_sys_mmap(l, v, retval) int -svr4_32_sys_mmap64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_mmap64(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_mmap64_args *uap = v; struct sys_mmap_args mm; @@ -573,12 +548,7 @@ svr4_32_sys_mmap64(l, v, retval) static int -svr4_32_mknod(l, retval, path, mode, dev) - struct lwp *l; - register_t *retval; - const char *path; - svr4_32_mode_t mode; - svr4_32_dev_t dev; +svr4_32_mknod(struct lwp *l, register_t *retval, const char *path, svr4_32_mode_t mode, svr4_32_dev_t dev) { if (S_ISFIFO(mode)) { struct sys_mkfifo_args ap; @@ -596,10 +566,7 @@ svr4_32_mknod(l, retval, path, mode, dev) int -svr4_32_sys_mknod(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_mknod(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_mknod_args *uap = v; return svr4_32_mknod(l, retval, @@ -609,10 +576,7 @@ svr4_32_sys_mknod(l, v, retval) int -svr4_32_sys_xmknod(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_xmknod(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_xmknod_args *uap = v; return svr4_32_mknod(l, retval, @@ -622,20 +586,14 @@ svr4_32_sys_xmknod(l, v, retval) int -svr4_32_sys_vhangup(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_vhangup(struct lwp *l, void *v, register_t *retval) { return 0; } int -svr4_32_sys_sysconfig(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_sysconfig(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_sysconfig_args *uap = v; extern int maxfiles; @@ -772,10 +730,7 @@ svr4_32_sys_sysconfig(l, v, retval) /* ARGSUSED */ int -svr4_32_sys_break(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_break(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_break_args *uap = v; struct proc *p = l->l_proc; @@ -814,17 +769,13 @@ svr4_32_sys_break(l, v, retval) static inline clock_t -timeval_to_clock_t(tv) - struct timeval *tv; +timeval_to_clock_t(struct timeval *tv) { return tv->tv_sec * hz + tv->tv_usec / (1000000 / hz); } int -svr4_32_sys_times(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_times(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_times_args *uap = v; struct tms tms; @@ -852,10 +803,7 @@ svr4_32_sys_times(l, v, retval) int -svr4_32_sys_ulimit(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_ulimit(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_ulimit_args *uap = v; struct proc *p = l->l_proc; @@ -900,10 +848,7 @@ svr4_32_sys_ulimit(l, v, retval) int -svr4_32_sys_pgrpsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_pgrpsys(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_pgrpsys_args *uap = v; struct proc *p = l->l_proc; @@ -971,10 +916,7 @@ struct svr4_32_hrtcntl_args { static int -svr4_32_hrtcntl(p, uap, retval) - struct proc *p; - struct svr4_32_hrtcntl_args *uap; - register_t *retval; +svr4_32_hrtcntl(struct proc *p, struct svr4_32_hrtcntl_args *uap, register_t *retval) { switch (SCARG(uap, fun)) { case SVR4_HRT_CNTL_RES: @@ -1018,10 +960,7 @@ svr4_32_hrtcntl(p, uap, retval) int -svr4_32_sys_hrtsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_hrtsys(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_hrtsys_args *uap = v; @@ -1098,10 +1037,7 @@ svr4_32_setinfo(int pid, struct rusage *ru, int st, svr4_32_siginfo_tp si) int -svr4_32_sys_waitsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_waitsys(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_waitsys_args *uap = v; int options, error, status, was_zombie;; @@ -1213,10 +1149,7 @@ svr4_32_copyout_statvfs64(const struct statvfs *bfs, struct svr4_32_statvfs64 *s int -svr4_32_sys_statvfs(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_statvfs(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_statvfs_args *uap = v; struct statvfs *sb; @@ -1232,10 +1165,7 @@ svr4_32_sys_statvfs(l, v, retval) int -svr4_32_sys_fstatvfs(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_fstatvfs(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_fstatvfs_args *uap = v; struct statvfs *sb; @@ -1251,10 +1181,7 @@ svr4_32_sys_fstatvfs(l, v, retval) int -svr4_32_sys_statvfs64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_statvfs64(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_statvfs64_args *uap = v; struct statvfs *sb; @@ -1270,10 +1197,7 @@ svr4_32_sys_statvfs64(l, v, retval) int -svr4_32_sys_fstatvfs64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_fstatvfs64(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_fstatvfs64_args *uap = v; struct statvfs *sb; @@ -1290,10 +1214,7 @@ svr4_32_sys_fstatvfs64(l, v, retval) int -svr4_32_sys_alarm(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_alarm(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_alarm_args *uap = v; struct itimerval tp; @@ -1312,10 +1233,7 @@ svr4_32_sys_alarm(l, v, retval) int -svr4_32_sys_gettimeofday(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_gettimeofday(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_gettimeofday_args *uap = v; @@ -1331,10 +1249,7 @@ svr4_32_sys_gettimeofday(l, v, retval) int -svr4_32_sys_facl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_facl(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_facl_args *uap = v; @@ -1359,20 +1274,14 @@ svr4_32_sys_facl(l, v, retval) int -svr4_32_sys_acl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_acl(struct lwp *l, void *v, register_t *retval) { return svr4_32_sys_facl(l, v, retval); /* XXX: for now the same */ } int -svr4_32_sys_auditsys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_auditsys(struct lwp *l, void *v, register_t *retval) { /* * XXX: Big brother is *not* watching. @@ -1382,10 +1291,7 @@ svr4_32_sys_auditsys(l, v, retval) int -svr4_32_sys_memcntl(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_memcntl(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_memcntl_args *uap = v; switch (SCARG(uap, cmd)) { @@ -1421,10 +1327,7 @@ svr4_32_sys_memcntl(l, v, retval) int -svr4_32_sys_nice(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_nice(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_nice_args *uap = v; struct sys_setpriority_args ap; @@ -1445,10 +1348,7 @@ svr4_32_sys_nice(l, v, retval) int -svr4_32_sys_resolvepath(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_resolvepath(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_resolvepath_args *uap = v; struct nameidata nd; diff --git a/sys/compat/svr4_32/svr4_32_net.c b/sys/compat/svr4_32/svr4_32_net.c index 01fd8928c77..0de9482cf61 100644 --- a/sys/compat/svr4_32/svr4_32_net.c +++ b/sys/compat/svr4_32/svr4_32_net.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_32_net.c,v 1.15 2007/12/04 18:40:26 dsl Exp $ */ +/* $NetBSD: svr4_32_net.c,v 1.16 2007/12/08 18:36:28 dsl Exp $ */ /*- * Copyright (c) 1994 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_32_net.c,v 1.15 2007/12/04 18:40:26 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_32_net.c,v 1.16 2007/12/08 18:36:28 dsl Exp $"); #define COMPAT_SVR4 1 @@ -111,15 +111,13 @@ static const struct fileops svr4_32_netops = { * Used by new config, but we don't need it. */ int -svr4_32_netattach(n) - int n; +svr4_32_netattach(int n) { return 0; } struct svr4_strm * -svr4_32_stream_get(fp) - struct file *fp; +svr4_32_stream_get(struct file *fp) { struct socket *so; struct svr4_strm *st; diff --git a/sys/compat/svr4_32/svr4_32_resource.c b/sys/compat/svr4_32/svr4_32_resource.c index 7cc4c1548d7..008492fbd68 100644 --- a/sys/compat/svr4_32/svr4_32_resource.c +++ b/sys/compat/svr4_32/svr4_32_resource.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_32_resource.c,v 1.12 2007/12/04 18:40:26 dsl Exp $ */ +/* $NetBSD: svr4_32_resource.c,v 1.13 2007/12/08 18:36:28 dsl Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_32_resource.c,v 1.12 2007/12/04 18:40:26 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_32_resource.c,v 1.13 2007/12/08 18:36:28 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -59,8 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_32_resource.c,v 1.12 2007/12/04 18:40:26 dsl Ex static inline int svr4_to_native_rl(int); static inline int -svr4_to_native_rl(rl) - int rl; +svr4_to_native_rl(int rl) { switch (rl) { case SVR4_RLIMIT_CPU: @@ -97,10 +96,7 @@ svr4_to_native_rl(rl) ((svr4_rlim64_t)(l)) != SVR4_RLIM64_SAVED_MAX) int -svr4_32_sys_getrlimit(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_getrlimit(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_getrlimit_args *uap = v; struct proc *p = l->l_proc; @@ -162,10 +158,7 @@ svr4_32_sys_getrlimit(l, v, retval) int -svr4_32_sys_setrlimit(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_setrlimit(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_setrlimit_args *uap = v; struct proc *p = l->l_proc; @@ -215,10 +208,7 @@ svr4_32_sys_setrlimit(l, v, retval) int -svr4_32_sys_getrlimit64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_getrlimit64(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_getrlimit64_args *uap = v; struct proc *p = l->l_proc; @@ -264,10 +254,7 @@ svr4_32_sys_getrlimit64(l, v, retval) int -svr4_32_sys_setrlimit64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_setrlimit64(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_setrlimit64_args *uap = v; struct proc *p = l->l_proc; diff --git a/sys/compat/svr4_32/svr4_32_signal.c b/sys/compat/svr4_32/svr4_32_signal.c index d70b749bf83..4802baec5ed 100644 --- a/sys/compat/svr4_32/svr4_32_signal.c +++ b/sys/compat/svr4_32/svr4_32_signal.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_32_signal.c,v 1.22 2007/12/04 18:40:26 dsl Exp $ */ +/* $NetBSD: svr4_32_signal.c,v 1.23 2007/12/08 18:36:28 dsl Exp $ */ /*- * Copyright (c) 1994, 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_32_signal.c,v 1.22 2007/12/04 18:40:26 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_32_signal.c,v 1.23 2007/12/08 18:36:28 dsl Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_svr4.h" @@ -216,8 +216,7 @@ const int svr4_to_native_signo[SVR4_NSIG] = { #endif static inline void -svr4_32_sigfillset(s) - svr4_32_sigset_t *s; +svr4_32_sigfillset(svr4_32_sigset_t *s) { int i; @@ -228,9 +227,7 @@ svr4_32_sigfillset(s) } void -svr4_32_to_native_sigset(sss, bss) - const svr4_32_sigset_t *sss; - sigset_t *bss; +svr4_32_to_native_sigset(const svr4_32_sigset_t *sss, sigset_t *bss) { int i, newsig; @@ -246,9 +243,7 @@ svr4_32_to_native_sigset(sss, bss) void -native_to_svr4_32_sigset(bss, sss) - const sigset_t *bss; - svr4_32_sigset_t *sss; +native_to_svr4_32_sigset(const sigset_t *bss, svr4_32_sigset_t *sss) { int i, newsig; @@ -266,9 +261,7 @@ native_to_svr4_32_sigset(bss, sss) * XXX: Only a subset of the flags is currently implemented. */ void -svr4_32_to_native_sigaction(ssa, bsa) - const struct svr4_32_sigaction *ssa; - struct sigaction *bsa; +svr4_32_to_native_sigaction(const struct svr4_32_sigaction *ssa, struct sigaction *bsa) { bsa->sa_handler = NETBSD32PTR64(ssa->svr4_32_sa_handler); @@ -296,9 +289,7 @@ svr4_32_to_native_sigaction(ssa, bsa) } void -native_to_svr4_32_sigaction(bsa, ssa) - const struct sigaction *bsa; - struct svr4_32_sigaction *ssa; +native_to_svr4_32_sigaction(const struct sigaction *bsa, struct svr4_32_sigaction *ssa) { NETBSD32PTR32(ssa->svr4_32_sa_handler, bsa->sa_handler); @@ -317,10 +308,7 @@ native_to_svr4_32_sigaction(bsa, ssa) } int -svr4_32_sys_sigaction(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_sigaction(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_sigaction_args /* { syscallarg(int) signum; @@ -355,10 +343,7 @@ svr4_32_sys_sigaction(l, v, retval) } int -svr4_32_sys_sigaltstack(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_sigaltstack(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_sigaltstack_args /* { syscallarg(const struct svr4_32_sigaltstack_tp) nss; @@ -372,10 +357,7 @@ svr4_32_sys_sigaltstack(l, v, retval) * Stolen from the ibcs2 one */ int -svr4_32_sys_signal(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_signal(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_signal_args /* { syscallarg(int) signum; @@ -442,10 +424,7 @@ svr4_32_sys_signal(l, v, retval) } int -svr4_32_sys_sigprocmask(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_sigprocmask(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_sigprocmask_args /* { syscallarg(int) how; @@ -504,10 +483,7 @@ svr4_32_sys_sigprocmask(l, v, retval) } int -svr4_32_sys_sigpending(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_sigpending(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_sigpending_args /* { syscallarg(int) what; @@ -533,10 +509,7 @@ svr4_32_sys_sigpending(l, v, retval) } int -svr4_32_sys_sigsuspend(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_sigsuspend(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_sigsuspend_args /* { syscallarg(const svr4_32_sigset_t *) set; @@ -556,20 +529,14 @@ svr4_32_sys_sigsuspend(l, v, retval) } int -svr4_32_sys_pause(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_pause(struct lwp *l, void *v, register_t *retval) { return (sigsuspend1(l, 0)); } int -svr4_32_sys_kill(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_kill(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_kill_args /* { syscallarg(int) pid; @@ -583,10 +550,7 @@ svr4_32_sys_kill(l, v, retval) } void -svr4_32_getcontext(l, uc, mask) - struct lwp *l; - struct svr4_32_ucontext *uc; - const sigset_t *mask; +svr4_32_getcontext(struct lwp *l, struct svr4_32_ucontext *uc, const sigset_t *mask) { void *sp; struct svr4_32_sigaltstack *ss = &uc->uc_stack; @@ -617,9 +581,7 @@ svr4_32_getcontext(l, uc, mask) int -svr4_32_setcontext(l, uc) - struct lwp *l; - struct svr4_32_ucontext *uc; +svr4_32_setcontext(struct lwp *l, struct svr4_32_ucontext *uc) { int error; struct proc *p = l->l_proc; @@ -656,10 +618,7 @@ svr4_32_setcontext(l, uc) } int -svr4_32_sys_context(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_context(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_context_args /* { syscallarg(int) func; diff --git a/sys/compat/svr4_32/svr4_32_socket.c b/sys/compat/svr4_32/svr4_32_socket.c index 6360a6aa76b..19947c5d87b 100644 --- a/sys/compat/svr4_32/svr4_32_socket.c +++ b/sys/compat/svr4_32/svr4_32_socket.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_32_socket.c,v 1.9 2007/02/09 21:55:26 ad Exp $ */ +/* $NetBSD: svr4_32_socket.c,v 1.10 2007/12/08 18:36:28 dsl Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_32_socket.c,v 1.9 2007/02/09 21:55:26 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_32_socket.c,v 1.10 2007/12/08 18:36:28 dsl Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -86,11 +86,7 @@ static TAILQ_HEAD(svr4_sockcache_head, svr4_sockcache_entry) svr4_head; static int initialized = 0; struct sockaddr_un * -svr4_32_find_socket(p, fp, dev, ino) - struct proc *p; - struct file *fp; - dev_t dev; - svr4_ino_t ino; +svr4_32_find_socket(struct proc *p, struct file *fp, dev_t dev, svr4_ino_t ino) { struct svr4_sockcache_entry *e; void *cookie = ((struct socket *) fp->f_data)->so_internal; @@ -123,9 +119,7 @@ svr4_32_find_socket(p, fp, dev, ino) #if 0 void -svr4_32_delete_socket(p, fp) - struct proc *p; - struct file *fp; +svr4_32_delete_socket(struct proc *p, struct file *fp) { struct svr4_sockcache_entry *e; void *cookie = ((struct socket *) fp->f_data)->so_internal; @@ -149,10 +143,7 @@ svr4_32_delete_socket(p, fp) #if 0 int -svr4_32_add_socket(p, path, st) - struct proc *p; - const char *path; - struct stat *st; +svr4_32_add_socket(struct proc *p, const char *path, struct stat *st) { struct svr4_sockcache_entry *e; size_t len; @@ -187,10 +178,7 @@ svr4_32_add_socket(p, path, st) #endif int -svr4_32_sys_socket(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_socket(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_socket_args *uap = v; struct compat_30_sys_socket_args uap0; diff --git a/sys/compat/svr4_32/svr4_32_sockio.c b/sys/compat/svr4_32/svr4_32_sockio.c index d88c72f8903..f30d4d3e55c 100644 --- a/sys/compat/svr4_32/svr4_32_sockio.c +++ b/sys/compat/svr4_32/svr4_32_sockio.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_32_sockio.c,v 1.18 2007/12/05 01:10:47 dyoung Exp $ */ +/* $NetBSD: svr4_32_sockio.c,v 1.19 2007/12/08 18:36:29 dsl Exp $ */ /*- * Copyright (c) 1995 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_32_sockio.c,v 1.18 2007/12/05 01:10:47 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_32_sockio.c,v 1.19 2007/12/08 18:36:29 dsl Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -73,8 +73,7 @@ static int bsd_to_svr4_flags(int); if (bf & __CONCAT(I,a)) sf |= __CONCAT(SVR4_I,a) static int -bsd_to_svr4_flags(bf) - int bf; +bsd_to_svr4_flags(int bf) { int sf = 0; bsd_to_svr4_flag(FF_UP); @@ -92,13 +91,7 @@ bsd_to_svr4_flags(bf) } int -svr4_32_sock_ioctl(fp, l, retval, fd, cmd, data) - struct file *fp; - struct lwp *l; - register_t *retval; - int fd; - u_long cmd; - void *data; +svr4_32_sock_ioctl(struct file *fp, struct lwp *l, register_t *retval, int fd, u_long cmd, void *data) { int error; int (*ctl)(struct file *, u_long, void *, struct lwp *) = diff --git a/sys/compat/svr4_32/svr4_32_stat.c b/sys/compat/svr4_32/svr4_32_stat.c index c7a3ee04e73..69234e50635 100644 --- a/sys/compat/svr4_32/svr4_32_stat.c +++ b/sys/compat/svr4_32/svr4_32_stat.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_32_stat.c,v 1.30 2007/12/04 18:40:26 dsl Exp $ */ +/* $NetBSD: svr4_32_stat.c,v 1.31 2007/12/08 18:36:29 dsl Exp $ */ /*- * Copyright (c) 1994 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_32_stat.c,v 1.30 2007/12/04 18:40:26 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_32_stat.c,v 1.31 2007/12/08 18:36:29 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -100,9 +100,7 @@ static int svr4_32_to_bsd_pathconf(int); static void bsd_to_svr4_32_stat(struct stat *, struct svr4_32_stat *); static void -bsd_to_svr4_32_stat(st, st4) - struct stat *st; - struct svr4_32_stat *st4; +bsd_to_svr4_32_stat(struct stat *st, struct svr4_32_stat *st4) { memset(st4, 0, sizeof(*st4)); st4->st_dev = bsd_to_svr4_odev_t(st->st_dev); @@ -121,9 +119,7 @@ bsd_to_svr4_32_stat(st, st4) static void -bsd_to_svr4_32_xstat(st, st4) - struct stat *st; - struct svr4_32_xstat *st4; +bsd_to_svr4_32_xstat(struct stat *st, struct svr4_32_xstat *st4) { memset(st4, 0, sizeof(*st4)); st4->st_dev = bsd_to_svr4_dev_t(st->st_dev); @@ -147,9 +143,7 @@ bsd_to_svr4_32_xstat(st, st4) static void -bsd_to_svr4_32_stat64(st, st4) - struct stat *st; - struct svr4_32_stat64 *st4; +bsd_to_svr4_32_stat64(struct stat *st, struct svr4_32_stat64 *st4) { memset(st4, 0, sizeof(*st4)); st4->st_dev = bsd_to_svr4_dev_t(st->st_dev); @@ -172,10 +166,7 @@ bsd_to_svr4_32_stat64(st, st4) int -svr4_32_sys_stat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_stat(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_stat_args *uap = v; #ifdef SVR4_NO_OSTAT @@ -210,10 +201,7 @@ svr4_32_sys_stat(l, v, retval) int -svr4_32_sys_lstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_lstat(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_lstat_args *uap = v; #ifdef SVR4_NO_OSTAT @@ -248,10 +236,7 @@ svr4_32_sys_lstat(l, v, retval) int -svr4_32_sys_fstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_fstat(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_fstat_args *uap = v; #ifdef SVR4_NO_OSTAT @@ -279,10 +264,7 @@ svr4_32_sys_fstat(l, v, retval) int -svr4_32_sys_xstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_xstat(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_xstat_args *uap = v; struct stat st; @@ -305,10 +287,7 @@ svr4_32_sys_xstat(l, v, retval) int -svr4_32_sys_lxstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_lxstat(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_lxstat_args *uap = v; struct stat st; @@ -331,10 +310,7 @@ svr4_32_sys_lxstat(l, v, retval) int -svr4_32_sys_fxstat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_fxstat(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_fxstat_args *uap = v; struct stat st; @@ -353,10 +329,7 @@ svr4_32_sys_fxstat(l, v, retval) int -svr4_32_sys_stat64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_stat64(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_stat64_args *uap = v; struct stat st; @@ -379,10 +352,7 @@ svr4_32_sys_stat64(l, v, retval) int -svr4_32_sys_lstat64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_lstat64(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_lstat64_args *uap = v; struct stat st; @@ -405,10 +375,7 @@ svr4_32_sys_lstat64(l, v, retval) int -svr4_32_sys_fstat64(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_fstat64(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_fstat64_args *uap = v; struct stat st; @@ -432,10 +399,7 @@ struct svr4_32_ustat_args { }; int -svr4_32_ustat(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_ustat(struct lwp *l, void *v, register_t *retval) { struct svr4_32_ustat_args /* { syscallarg(svr4_dev_t) dev; @@ -460,10 +424,7 @@ svr4_32_ustat(l, v, retval) int -svr4_32_sys_uname(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_uname(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_uname_args *uap = v; struct svr4_utsname sut; @@ -491,10 +452,7 @@ svr4_32_sys_uname(l, v, retval) int -svr4_32_sys_systeminfo(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_systeminfo(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_systeminfo_args *uap = v; const char *str = NULL; @@ -632,10 +590,7 @@ svr4_32_sys_systeminfo(l, v, retval) int -svr4_32_sys_utssys(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_utssys(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_utssys_args *uap = v; @@ -666,10 +621,7 @@ svr4_32_sys_utssys(l, v, retval) int -svr4_32_sys_utime(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_utime(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_utime_args *uap = v; struct svr4_32_utimbuf ub; @@ -694,10 +646,7 @@ svr4_32_sys_utime(l, v, retval) int -svr4_32_sys_utimes(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_utimes(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_utimes_args *uap = v; struct sys_utimes_args ua; @@ -709,8 +658,7 @@ svr4_32_sys_utimes(l, v, retval) static int -svr4_32_to_bsd_pathconf(name) - int name; +svr4_32_to_bsd_pathconf(int name) { switch (name) { case SVR4_PC_LINK_MAX: @@ -759,10 +707,7 @@ svr4_32_to_bsd_pathconf(name) int -svr4_32_sys_pathconf(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_pathconf(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_pathconf_args *uap = v; struct sys_pathconf_args /* { @@ -787,10 +732,7 @@ svr4_32_sys_pathconf(l, v, retval) int -svr4_32_sys_fpathconf(l, v, retval) - struct lwp *l; - void *v; - register_t *retval; +svr4_32_sys_fpathconf(struct lwp *l, void *v, register_t *retval) { struct svr4_32_sys_fpathconf_args *uap = v; diff --git a/sys/compat/svr4_32/svr4_32_termios.c b/sys/compat/svr4_32/svr4_32_termios.c index c846a3cc148..cb40760b4dc 100644 --- a/sys/compat/svr4_32/svr4_32_termios.c +++ b/sys/compat/svr4_32/svr4_32_termios.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_32_termios.c,v 1.14 2007/12/04 18:40:27 dsl Exp $ */ +/* $NetBSD: svr4_32_termios.c,v 1.15 2007/12/08 18:36:29 dsl Exp $ */ /*- * Copyright (c) 1994 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_32_termios.c,v 1.14 2007/12/04 18:40:27 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_32_termios.c,v 1.15 2007/12/08 18:36:29 dsl Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -160,8 +160,7 @@ static void print_bsd_termios(const struct termios *); #ifdef DEBUG_SVR4 static void -print_svr4_32_termios(st) - const struct svr4_32_termios *st; +print_svr4_32_termios(const struct svr4_32_termios *st) { int i; uprintf("SVR4_32\niflag=%lo oflag=%lo cflag=%lo lflag=%lo\n", @@ -174,8 +173,7 @@ print_svr4_32_termios(st) static void -print_bsd_termios(bt) - const struct termios *bt; +print_bsd_termios(const struct termios *bt) { int i; uprintf("BSD\niflag=%o oflag=%o cflag=%o lflag=%o\n", @@ -188,9 +186,7 @@ print_bsd_termios(bt) #endif /* DEBUG_SVR4 */ static u_long -bsd_to_svr4_32_speed(sp, mask) - u_long sp; - u_long mask; +bsd_to_svr4_32_speed(u_long sp, u_long mask) { switch (sp) { #undef getval @@ -226,9 +222,7 @@ bsd_to_svr4_32_speed(sp, mask) static u_long -svr4_32_to_bsd_speed(sp, mask) - u_long sp; - u_long mask; +svr4_32_to_bsd_speed(u_long sp, u_long mask) { while ((mask & 1) == 0) { mask >>= 1; @@ -262,10 +256,7 @@ svr4_32_to_bsd_speed(sp, mask) static void -svr4_32_to_bsd_termios(st, bt, new) - const struct svr4_32_termios *st; - struct termios *bt; - int new; +svr4_32_to_bsd_termios(const struct svr4_32_termios *st, struct termios *bt, int new) { /* control characters */ /* @@ -364,9 +355,7 @@ svr4_32_to_bsd_termios(st, bt, new) static void -bsd_to_svr4_32_termios(bt, st) - const struct termios *bt; - struct svr4_32_termios *st; +bsd_to_svr4_32_termios(const struct termios *bt, struct svr4_32_termios *st) { /* control characters */ /* @@ -467,9 +456,7 @@ bsd_to_svr4_32_termios(bt, st) static void -svr4_termio_to_termios(t, ts) - const struct svr4_termio *t; - struct svr4_32_termios *ts; +svr4_termio_to_termios(const struct svr4_termio *t, struct svr4_32_termios *ts) { int i; @@ -484,9 +471,7 @@ svr4_termio_to_termios(t, ts) static void -svr4_32_termios_to_termio(ts, t) - const struct svr4_32_termios *ts; - struct svr4_termio *t; +svr4_32_termios_to_termio(const struct svr4_32_termios *ts, struct svr4_termio *t) { int i; @@ -501,13 +486,7 @@ svr4_32_termios_to_termio(ts, t) } int -svr4_32_term_ioctl(fp, l, retval, fd, cmd, data) - struct file *fp; - struct lwp *l; - register_t *retval; - int fd; - u_long cmd; - void *data; +svr4_32_term_ioctl(struct file *fp, struct lwp *l, register_t *retval, int fd, u_long cmd, void *data) { struct termios bt; struct svr4_32_termios st; diff --git a/sys/compat/vax1k/vax1k_exec.c b/sys/compat/vax1k/vax1k_exec.c index a1d1186c85f..9dacf5d2f34 100644 --- a/sys/compat/vax1k/vax1k_exec.c +++ b/sys/compat/vax1k/vax1k_exec.c @@ -1,4 +1,4 @@ -/* $NetBSD: vax1k_exec.c,v 1.13 2007/12/04 18:40:27 dsl Exp $ */ +/* $NetBSD: vax1k_exec.c,v 1.14 2007/12/08 18:36:29 dsl Exp $ */ /* * Copyright (c) 1993, 1994 Christopher G. Demetriou @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vax1k_exec.c,v 1.13 2007/12/04 18:40:27 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vax1k_exec.c,v 1.14 2007/12/08 18:36:29 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -75,9 +75,7 @@ int exec_vax1k_prep_anymagic(struct lwp *l, struct exec_package *epp, */ int -exec_vax1k_makecmds(l, epp) - struct lwp *l; - struct exec_package *epp; +exec_vax1k_makecmds(struct lwp *l, struct exec_package *epp) { u_long midmag, magic; u_short mid; |
