 @@ -1,14 +1,14 @@
-/*	$NetBSD: fdesc_vnops.c,v 1.105 2009/03/14 15:36:22 dsl Exp $	*/
+/*	$NetBSD: fdesc_vnops.c,v 1.106 2009/03/15 17:22:37 cegger Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software donated to Berkeley by
  * Jan-Simon Pendry.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -31,27 +31,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)fdesc_vnops.c	8.17 (Berkeley) 5/22/95
+ *
  * #Id: fdesc_vnops.c,v 1.12 1993/04/06 16:17:17 jsp Exp #
  */
 /*
  * /dev/fd Filesystem
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdesc_vnops.c,v 1.105 2009/03/14 15:36:22 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdesc_vnops.c,v 1.106 2009/03/15 17:22:37 cegger Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>	/* boottime */
 #include <sys/resourcevar.h>
 #include <sys/socketvar.h>
 #include <sys/filedesc.h>
 #include <sys/vnode.h>
 #include <sys/malloc.h>
 #include <sys/conf.h>
 #include <sys/file.h>
 @@ -172,41 +172,41 @@ const struct vnodeopv_entry_desc fdesc_v
 	{ &vop_putpages_desc, fdesc_putpages },		/* putpages */
 	{ NULL, NULL }
 };
 const struct vnodeopv_desc fdesc_vnodeop_opv_desc =
 	{ &fdesc_vnodeop_p, fdesc_vnodeop_entries };
 extern const struct cdevsw ctty_cdevsw;
 /*
  * Initialise cache headers
  */
 void
-fdesc_init()
+fdesc_init(void)
+{
 	int cttymajor;
 	/* locate the major number */
 	cttymajor = cdevsw_lookup_major(&ctty_cdevsw);
 	devctty = makedev(cttymajor, 0);
 	fdhashtbl = hashinit(NFDCACHE, HASH_LIST, true, &fdhash);
+}
 /*
  * Free hash table.
  */
 void
-fdesc_done()
+fdesc_done(void)
+{
 	hashdone(fdhashtbl, HASH_LIST, fdhash);
+}
 /*
  * Return a locked vnode of the correct type.
  */
 int
 fdesc_allocvp(fdntype ftype, int ix, struct mount *mp, struct vnode **vpp)
+{
 	struct fdhashhead *fc;
 	struct fdescnode *fd;
 	int error = 0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: layer_subr.c,v 1.26 2009/03/14 15:36:22 dsl Exp $	*/
+/*	$NetBSD: layer_subr.c,v 1.27 2009/03/15 17:22:38 cegger Exp $	*/
 /*
  * Copyright (c) 1999 National Aeronautics & Space Administration
  * All rights reserved.
+ *
  * This software was written by William Studenmund of the
  * Numerical Aerospace Simulation Facility, NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -58,27 +58,27 @@
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	from: Id: lofs_subr.c,v 1.11 1992/05/30 10:05:43 jsp Exp
  *	@(#)null_subr.c	8.7 (Berkeley) 5/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: layer_subr.c,v 1.26 2009/03/14 15:36:22 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: layer_subr.c,v 1.27 2009/03/15 17:22:38 cegger Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/time.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/kmem.h>
 #include <sys/malloc.h>
 #include <miscfs/specfs/specdev.h>
 #include <miscfs/genfs/layer.h>
 @@ -92,39 +92,39 @@ int layerfs_debug = 1;
 /*
  * layer cache:
  * Each cache entry holds a reference to the lower vnode
  * along with a pointer to the alias vnode.  When an
  * entry is added the lower vnode is VREF'd.  When the
  * alias is removed the lower vnode is vrele'd.
  */
 /*
  * Initialise cache headers
  */
 void
-layerfs_init()
+layerfs_init(void)
+{
 #ifdef LAYERFS_DIAGNOSTIC
 	if (layerfs_debug)
 		printf("layerfs_init\n");		/* printed during system boot */
 #endif
+}
 /*
  * Free global resources of layerfs.
  */
 void
-layerfs_done()
+layerfs_done(void)
+{
 #ifdef LAYERFS_DIAGNOSTIC
 	if (layerfs_debug)
 		printf("layerfs_done\n");		/* printed on layerfs detach */
 #endif
+}
 /*
  * Return a locked, VREF'ed alias for lower vnode if already exists, else NULL.
  * The layermp's hashlock must be held on entry.
  * It will be held upon return iff we return NULL.
  */
 struct vnode *

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kernfs_subr.c,v 1.19 2009/03/14 15:36:22 dsl Exp $	*/
+/*	$NetBSD: kernfs_subr.c,v 1.20 2009/03/15 17:22:38 cegger Exp $	*/
 /*
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -63,27 +63,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)kernfs_subr.c	8.6 (Berkeley) 5/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kernfs_subr.c,v 1.19 2009/03/14 15:36:22 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kernfs_subr.c,v 1.20 2009/03/15 17:22:38 cegger Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_ipsec.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/malloc.h>
 #include <sys/stat.h>
 @@ -244,36 +244,36 @@ kernfs_freevp(struct vnode *vp)
 	kernfs_hashrem(kfs);
 	TAILQ_REMOVE(&VFSTOKERNFS(vp->v_mount)->nodelist, kfs, kfs_list);
 	free(vp->v_data, M_TEMP);
 	vp->v_data = 0;
 	return (0);
+}
 /*
  * Initialize kfsnode hash table.
  */
 void
-kernfs_hashinit()
+kernfs_hashinit(void)
+{
 	mutex_init(&kfs_hashlock, MUTEX_DEFAULT, IPL_NONE);
 	mutex_init(&kfs_ihash_lock, MUTEX_DEFAULT, IPL_NONE);
 	kfs_hashtbl = hashinit(desiredvnodes / 4, HASH_LIST, true, &kfs_ihash);
+}
 void
-kernfs_hashreinit()
+kernfs_hashreinit(void)
+{
 	struct kernfs_node *pp;
 	struct kfs_hashhead *oldhash, *hash;
 	u_long i, oldmask, mask, val;
 	hash = hashinit(desiredvnodes / 4, HASH_LIST, true, &mask);
 	mutex_enter(&kfs_ihash_lock);
 	oldhash = kfs_hashtbl;
 	oldmask = kfs_ihash;
 	kfs_hashtbl = hash;
 	kfs_ihash = mask;
 	for (i = 0; i <= oldmask; i++) {
 @@ -281,27 +281,27 @@ kernfs_hashreinit()
 			LIST_REMOVE(pp, kfs_hash);
 			val = KFSVALUEHASH(pp->kfs_value);
 			LIST_INSERT_HEAD(&hash[val], pp, kfs_hash);
+		}
+	}
 	mutex_exit(&kfs_ihash_lock);
 	hashdone(oldhash, HASH_LIST, oldmask);
+}
 /*
  * Free kfsnode hash table.
  */
 void
-kernfs_hashdone()
+kernfs_hashdone(void)
+{
 	hashdone(kfs_hashtbl, HASH_LIST, kfs_ihash);
 	mutex_destroy(&kfs_hashlock);
 	mutex_destroy(&kfs_ihash_lock);
+}
 struct vnode *
 kernfs_hashget(kfstype type, struct mount *mp, const struct kern_target *kt, u_int32_t value)
+{
 	struct kfs_hashhead *ppp;
 	struct kernfs_node *pp;
 	struct vnode *vp;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kernfs_vfsops.c,v 1.88 2009/03/14 15:36:22 dsl Exp $	*/
+/*	$NetBSD: kernfs_vfsops.c,v 1.89 2009/03/15 17:22:38 cegger Exp $	*/
 /*
  * Copyright (c) 1992, 1993, 1995
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software donated to Berkeley by
  * Jan-Simon Pendry.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -29,27 +29,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)kernfs_vfsops.c	8.10 (Berkeley) 5/14/95
  */
 /*
  * Kernel params Filesystem
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kernfs_vfsops.c,v 1.88 2009/03/14 15:36:22 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kernfs_vfsops.c,v 1.89 2009/03/15 17:22:38 cegger Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/conf.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 @@ -66,49 +66,49 @@ __KERNEL_RCSID(0, "$NetBSD: kernfs_vfsop
 MODULE(MODULE_CLASS_VFS, kernfs, NULL);
 MALLOC_JUSTDEFINE(M_KERNFSMNT, "kernfs mount", "kernfs mount structures");
 dev_t rrootdev = NODEV;
 VFS_PROTOS(kernfs);
 void	kernfs_get_rrootdev(void);
 static struct sysctllog *kernfs_sysctl_log;
 void
-kernfs_init()
+kernfs_init(void)
+{
 	malloc_type_attach(M_KERNFSMNT);
 	kernfs_hashinit();
+}
 void
-kernfs_reinit()
+kernfs_reinit(void)
+{
 	kernfs_hashreinit();
+}
 void
-kernfs_done()
+kernfs_done(void)
+{
 	kernfs_hashdone();
 	malloc_type_detach(M_KERNFSMNT);
+}
 void
-kernfs_get_rrootdev()
+kernfs_get_rrootdev(void)
+{
 	static int tried = 0;
 	if (tried) {
 		/* Already did it once. */
 		return;
+	}
 	tried = 1;
 	if (rootdev == NODEV)
 		return;
 	rrootdev = devsw_blk2chr(rootdev);
 	if (rrootdev != NODEV)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: portal_vfsops.c,v 1.78 2009/03/14 15:36:23 dsl Exp $	*/
+/*	$NetBSD: portal_vfsops.c,v 1.79 2009/03/15 17:22:38 cegger Exp $	*/
 /*
  * Copyright (c) 1992, 1993, 1995
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software donated to Berkeley by
  * Jan-Simon Pendry.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -30,27 +30,27 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	from: Id: portal_vfsops.c,v 1.5 1992/05/30 10:25:27 jsp Exp
  *	@(#)portal_vfsops.c	8.11 (Berkeley) 5/14/95
  */
 /*
  * Portal Filesystem
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: portal_vfsops.c,v 1.78 2009/03/14 15:36:23 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: portal_vfsops.c,v 1.79 2009/03/15 17:22:38 cegger Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/time.h>
 #include <sys/proc.h>
 #include <sys/filedesc.h>
 #include <sys/file.h>
 #include <sys/vnode.h>
 @@ -68,32 +68,32 @@ __KERNEL_RCSID(0, "$NetBSD: portal_vfsop
 #include <sys/module.h>
 #include <miscfs/genfs/genfs.h>
 #include <miscfs/portal/portal.h>
 MODULE(MODULE_CLASS_VFS, portal, NULL);
 VFS_PROTOS(portal);
 static struct sysctllog *portal_sysctl_log;
 void
-portal_init()
+portal_init(void)
+{
+}
 void
-portal_done()
+portal_done(void)
+{
+}
 /*
  * Mount the per-process file descriptors (/dev/fd)
  */
 int
 portal_mount(
     struct mount *mp,
     const char *path,
     void *data,
     size_t *data_len)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: procfs_subr.c,v 1.94 2009/03/14 15:36:23 dsl Exp $	*/
+/*	$NetBSD: procfs_subr.c,v 1.95 2009/03/15 17:22:38 cegger Exp $	*/
 /*-
  * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -92,27 +92,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)procfs_subr.c	8.6 (Berkeley) 5/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_subr.c,v 1.94 2009/03/14 15:36:23 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_subr.c,v 1.95 2009/03/15 17:22:38 cegger Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/malloc.h>
 #include <sys/stat.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/kauth.h>
 @@ -529,35 +529,35 @@ vfs_findname(const vfs_namemap_t *nm, co
+{
 	for (; nm->nm_name; nm++)
 		if (memcmp(bf, nm->nm_name, buflen+1) == 0)
 			return (nm);
 	return (0);
+}
 /*
  * Initialize pfsnode hash table.
  */
 void
-procfs_hashinit()
+procfs_hashinit(void)
+{
 	mutex_init(&pfs_hashlock, MUTEX_DEFAULT, IPL_NONE);
 	mutex_init(&pfs_ihash_lock, MUTEX_DEFAULT, IPL_NONE);
 	pfs_hashtbl = hashinit(desiredvnodes / 4, HASH_LIST, true, &pfs_ihash);
+}
 void
-procfs_hashreinit()
+procfs_hashreinit(void)
+{
 	struct pfsnode *pp;
 	struct pfs_hashhead *oldhash, *hash;
 	u_long i, oldmask, mask, val;
 	hash = hashinit(desiredvnodes / 4, HASH_LIST, true, &mask);
 	mutex_enter(&pfs_ihash_lock);
 	oldhash = pfs_hashtbl;
 	oldmask = pfs_ihash;
 	pfs_hashtbl = hash;
 	pfs_ihash = mask;
 	for (i = 0; i <= oldmask; i++) {
 @@ -565,27 +565,27 @@ procfs_hashreinit()
 			LIST_REMOVE(pp, pfs_hash);
 			val = PFSPIDHASH(pp->pfs_pid);
 			LIST_INSERT_HEAD(&hash[val], pp, pfs_hash);
+		}
+	}
 	mutex_exit(&pfs_ihash_lock);
 	hashdone(oldhash, HASH_LIST, oldmask);
+}
 /*
  * Free pfsnode hash table.
  */
 void
-procfs_hashdone()
+procfs_hashdone(void)
+{
 	hashdone(pfs_hashtbl, HASH_LIST, pfs_ihash);
 	mutex_destroy(&pfs_hashlock);
 	mutex_destroy(&pfs_ihash_lock);
+}
 struct vnode *
 procfs_hashget(pid_t pid, pfstype type, int fd, struct mount *mp, int flags)
+{
 	struct pfs_hashhead *ppp;
 	struct pfsnode *pp;
 	struct vnode *vp;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: procfs_vfsops.c,v 1.82 2009/03/14 15:36:23 dsl Exp $	*/
+/*	$NetBSD: procfs_vfsops.c,v 1.83 2009/03/15 17:22:38 cegger Exp $	*/
 /*
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -66,27 +66,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)procfs_vfsops.c	8.7 (Berkeley) 5/10/95
  */
 /*
  * procfs VFS interface
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_vfsops.c,v 1.82 2009/03/14 15:36:23 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_vfsops.c,v 1.83 2009/03/15 17:22:38 cegger Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #endif
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/syslog.h>
 @@ -242,39 +242,39 @@ procfs_sync(
 	return (0);
+}
 /*ARGSUSED*/
 int
 procfs_vget(struct mount *mp, ino_t ino,
     struct vnode **vpp)
+{
 	return (EOPNOTSUPP);
+}
 void
-procfs_init()
+procfs_init(void)
+{
 	procfs_hashinit();
+}
 void
-procfs_reinit()
+procfs_reinit(void)
+{
 	procfs_hashreinit();
+}
 void
-procfs_done()
+procfs_done(void)
+{
 	procfs_hashdone();
+}
 extern const struct vnodeopv_desc procfs_vnodeop_opv_desc;
 const struct vnodeopv_desc * const procfs_vnodeopv_descs[] = {
 	&procfs_vnodeop_opv_desc,
 	NULL,
 };
 struct vfsops procfs_vfsops = {
 	MOUNT_PROCFS,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sync_subr.c,v 1.39 2009/03/14 21:04:25 dsl Exp $	*/
+/*	$NetBSD: sync_subr.c,v 1.40 2009/03/15 17:22:38 cegger Exp $	*/
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -51,27 +51,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL MARSHALL KIRK MCKUSICK BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sync_subr.c,v 1.39 2009/03/14 21:04:25 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sync_subr.c,v 1.40 2009/03/15 17:22:38 cegger Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/time.h>
 #include <sys/vnode.h>
 #include <sys/buf.h>
 #include <sys/errno.h>
 #include <sys/kmem.h>
 @@ -93,27 +93,27 @@ time_t lockdelay = 1;			/* time to delay
 kmutex_t syncer_mutex;			/* used to freeze syncer, long term */
 static kmutex_t syncer_data_lock;	/* short term lock on data structures */
 static int rushjob;			/* number of slots to run ASAP */
 static kcondvar_t syncer_cv;		/* cv for rushjob */
 static int stat_rush_requests;		/* number of times I/O speeded up */
 static int syncer_delayno = 0;
 static long syncer_last;
 static struct synclist *syncer_workitem_pending;
 struct lwp *updateproc = NULL;
 void
-vn_initialize_syncerd()
+vn_initialize_syncerd(void)
+{
 	int i;
 	syncer_last = SYNCER_MAXDELAY + 2;
 	syncer_workitem_pending =
 	    kmem_alloc(syncer_last * sizeof (struct synclist), KM_SLEEP);
 	for (i = 0; i < syncer_last; i++)
 		TAILQ_INIT(&syncer_workitem_pending[i]);
 	mutex_init(&syncer_mutex, MUTEX_DEFAULT, IPL_NONE);
 	mutex_init(&syncer_data_lock, MUTEX_DEFAULT, IPL_NONE);
 @@ -318,27 +318,27 @@ sched_sync(void *v)
 			if (time_second == starttime)
 				cv_timedwait(&syncer_cv, &syncer_data_lock, hz);
+		}
 		mutex_exit(&syncer_data_lock);
+	}
+}
 /*
  * Request the syncer daemon to speed up its work.
  * We never push it to speed up more than half of its
  * normal turn time, otherwise it could take over the CPU.
  */
 int
-speedup_syncer()
+speedup_syncer(void)
+{
 	mutex_enter(&syncer_data_lock);
 	if (rushjob >= syncdelay / 2) {
 		mutex_exit(&syncer_data_lock);
 		return (0);
+	}
 	rushjob++;
 	cv_signal(&syncer_cv);
 	stat_rush_requests += 1;
 	mutex_exit(&syncer_data_lock);
 	return (1);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: umap_subr.c,v 1.27 2009/03/14 15:36:23 dsl Exp $	*/
+/*	$NetBSD: umap_subr.c,v 1.28 2009/03/15 17:22:38 cegger Exp $	*/
 /*
  * Copyright (c) 1999 National Aeronautics & Space Administration
  * All rights reserved.
+ *
  * This software was written by William Studenmund of the
  * Numerical Aerospace Simulation Facility, NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -58,78 +58,72 @@
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	from: Id: lofs_subr.c, v 1.11 1992/05/30 10:05:43 jsp Exp
  *	@(#)umap_subr.c	8.9 (Berkeley) 5/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umap_subr.c,v 1.27 2009/03/14 15:36:23 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umap_subr.c,v 1.28 2009/03/15 17:22:38 cegger Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/time.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/malloc.h>
 #include <sys/kauth.h>
 #include <miscfs/specfs/specdev.h>
 #include <miscfs/umapfs/umap.h>
 u_long umap_findid(u_long, u_long [][2], int);
 int umap_node_alloc(struct mount *, struct vnode *,
 				struct vnode **);
 /*
  * umap_findid is called by various routines in umap_vnodeops.c to
  * find a user or group id in a map.
  */
 u_long
-umap_findid(id, map, nentries)
+umap_findid(u_long id, u_long map[][2], int nentries)
 	u_long id;
 	u_long map[][2];
 	int nentries;
+{
 	int i;
 	/* Find uid entry in map */
 	i = 0;
 	while ((i<nentries) && ((map[i][0]) != id))
 		i++;
 	if (i < nentries)
 		return (map[i][1]);
 	else
 		return (-1);
+}
 /*
  * umap_reverse_findid is called by umap_getattr() in umap_vnodeops.c to
  * find a user or group id in a map, in reverse.
  */
 u_long
-umap_reverse_findid(id, map, nentries)
+umap_reverse_findid(u_long id, u_long map[][2], int nentries)
 	u_long id;
 	u_long map[][2];
 	int nentries;
+{
 	int i;
 	/* Find uid entry in map */
 	i = 0;
 	while ((i<nentries) && ((map[i][1]) != id))
 		i++;
 	if (i < nentries)
 		return (map[i][0]);
 	else
 		return (-1);