 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_cctr.c,v 1.8 2008/05/19 17:06:02 ad Exp $	*/
+/*	$NetBSD: kern_cctr.c,v 1.9 2009/01/03 03:31:23 yamt Exp $	*/
 /*-
  * Copyright (c) 2006, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * re-implementation of TSC for MP systems merging cc_microtime and
  * TSC for timecounters by Frank Kardel
+ *
  * 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.
 @@ -65,27 +65,27 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR 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.
  */
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/sys/i386/i386/tsc.c,v 1.204 2003/10/21 18:28:34 silby Exp $"); */
-__KERNEL_RCSID(0, "$NetBSD: kern_cctr.c,v 1.8 2008/05/19 17:06:02 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_cctr.c,v 1.9 2009/01/03 03:31:23 yamt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/time.h>
 #include <sys/timetc.h>
 #include <sys/kernel.h>
 #include <sys/power.h>
 #include <sys/cpu.h>
 #include <machine/cpu_counter.h>
 /* XXX make cc_timecounter.tc_frequency settable by sysctl() */
 @@ -251,27 +251,27 @@ cc_calibrate_cpu(struct cpu_info *ci)
 	ci->ci_cc.cc_gen = 0;
 	denom = ci->ci_cc.cc_cc;
 	ci->ci_cc.cc_cc = cpu_counter32();
 	if (ci->ci_cc.cc_denom == 0) {
 		/*
 		 * This is our first time here on this CPU.  Just
 		 * start with reasonable initial values.
 		 */
 		ci->ci_cc.cc_val = val;
 		ci->ci_cc.cc_denom = cpu_frequency(ci);
 		if (ci->ci_cc.cc_denom == 0)
-			ci->ci_cc.cc_denom = cc_timecounter.tc_frequency;;
+			ci->ci_cc.cc_denom = cc_timecounter.tc_frequency;
 		ci->ci_cc.cc_delta = ci->ci_cc.cc_denom;
 		ci->ci_cc.cc_gen = gen;
 		splx(s);
 		return;
+	}
 #ifdef TIMECOUNTER_DEBUG
 	old_factor = (ci->ci_cc.cc_delta * 1000 ) / ci->ci_cc.cc_denom;
 #endif
 	/* local ticks per period */
 	denom = ci->ci_cc.cc_cc - denom;
 	if (denom < 0)

 @@ -1,14 +1,14 @@
-/* $NetBSD: kern_drvctl.c,v 1.20 2008/11/23 23:59:41 jmcneill Exp $ */
+/* $NetBSD: kern_drvctl.c,v 1.21 2009/01/03 03:31:23 yamt Exp $ */
 /*
  * Copyright (c) 2004
  * 	Matthias Drochner.  All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,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 THE AUTHOR 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.20 2008/11/23 23:59:41 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.21 2009/01/03 03:31:23 yamt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/event.h>
 #include <sys/malloc.h>
 #include <sys/kmem.h>
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 @@ -96,27 +96,27 @@ static int drvctl_getevent(struct lwp *,
 void
 drvctl_init(void)
+{
 	TAILQ_INIT(&drvctl_eventq);
 	mutex_init(&drvctl_lock, MUTEX_DEFAULT, IPL_NONE);
 	cv_init(&drvctl_cond, "devmon");
 	selinit(&drvctl_rdsel);
+}
 void
 devmon_insert(const char *event, prop_dictionary_t ev)
+{
-	struct drvctl_event *dce, *odce;;
+	struct drvctl_event *dce, *odce;
 	mutex_enter(&drvctl_lock);
 	if (drvctl_nopen == 0) {
 		mutex_exit(&drvctl_lock);
 		return;
+	}
 	/* Fill in mandatory member */
 	if (!prop_dictionary_set_cstring_nocopy(ev, "event", event)) {
 		prop_object_release(ev);
 		mutex_exit(&drvctl_lock);
 		return;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_subr.c,v 1.363 2008/12/29 17:41:18 pooka Exp $	*/
+/*	$NetBSD: vfs_subr.c,v 1.364 2009/01/03 03:31:23 yamt Exp $	*/
 /*-
  * Copyright (c) 1997, 1998, 2004, 2005, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, by Charles M. Hannum, and 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
 @@ -71,27 +71,27 @@
+ *
  * At nearly all points it is known that v_usecount could be zero, the
  * vnode interlock will be held.
+ *
  * To change v_usecount away from zero, the interlock must be held.  To
  * change from a non-zero value to zero, again the interlock must be
  * held.
+ *
  * Changing the usecount from a non-zero value to a non-zero value can
  * safely be done using atomic operations, without the interlock held.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.363 2008/12/29 17:41:18 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.364 2009/01/03 03:31:23 yamt Exp $");
 #include "opt_ddb.h"
 #include "opt_compat_netbsd.h"
 #include "opt_compat_43.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/mount.h>
 #include <sys/fcntl.h>
 #include <sys/vnode.h>
 @@ -168,27 +168,27 @@ MALLOC_DEFINE(M_VNODE, "vnodes", "Dynami
 /*
  * These define the root filesystem and device.
  */
 struct vnode *rootvnode;
 struct device *root_device;			/* root device */
 /*
  * Local declarations.
  */
 static void vrele_thread(void *);
 static void insmntque(vnode_t *, struct mount *);
 static int getdevvp(dev_t, vnode_t **, enum vtype);
-static vnode_t *getcleanvnode(void);;
+static vnode_t *getcleanvnode(void);
 void vpanic(vnode_t *, const char *);
 #ifdef DEBUG
 void printlockedvnodes(void);
 #endif
 #ifdef DIAGNOSTIC
 void
 vpanic(vnode_t *vp, const char *msg)
+{
 	vprint(NULL, vp);
 	panic("%s\n", msg);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_wapbl.c,v 1.16 2008/11/24 16:05:21 joerg Exp $	*/
+/*	$NetBSD: vfs_wapbl.c,v 1.17 2009/01/03 03:31:23 yamt Exp $	*/
 /*-
  * Copyright (c) 2003,2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Wasabi Systems, Inc.
+ *
  * 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.
 @@ -26,27 +26,27 @@
  * 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.
  */
 /*
  * This implements file system independent write ahead filesystem logging.
  */
 #define WAPBL_INTERNAL
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.16 2008/11/24 16:05:21 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.17 2009/01/03 03:31:23 yamt Exp $");
 #include <sys/param.h>
 #ifdef _KERNEL
 #include <sys/param.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/uio.h>
 #include <sys/vnode.h>
 #include <sys/file.h>
 #include <sys/malloc.h>
 #include <sys/resourcevar.h>
 #include <sys/conf.h>
 @@ -1868,27 +1868,27 @@ wapbl_write_commit(struct wapbl *wl, off
 	/* XXX Calc checksum here, instead we do this for now */
 	error = VOP_IOCTL(wl->wl_devvp, DIOCCACHESYNC, &force, FWRITE, FSCRED);
 	if (error) {
 		WAPBL_PRINTF(WAPBL_PRINT_ERROR,
 		    ("wapbl_write_commit: DIOCCACHESYNC on dev 0x%x "
 		    "returned %d\n", wl->wl_devvp->v_rdev, error));
+	}
 	wc->wc_head = head;
 	wc->wc_tail = tail;
 	wc->wc_checksum = 0;
 	wc->wc_version = 1;
 	getnanotime(&ts);
-	wc->wc_time = ts.tv_sec;;
+	wc->wc_time = ts.tv_sec;
 	wc->wc_timensec = ts.tv_nsec;
 	WAPBL_PRINTF(WAPBL_PRINT_WRITE,
 	    ("wapbl_write_commit: head = %"PRIdMAX "tail = %"PRIdMAX"\n",
 	    (intmax_t)head, (intmax_t)tail));
 	/*
 	 * XXX if generation will rollover, then first zero
 	 * over second commit header before trying to write both headers.
 	 */
 	error = wapbl_write(wc, wc->wc_len, wl->wl_devvp,
 	    wl->wl_logpbn + wc->wc_generation % 2);