 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvm_meter.c,v 1.63 2014/02/26 20:33:53 martin Exp $	*/
+/*	$NetBSD: uvm_meter.c,v 1.63.4.1 2014/12/17 17:58:03 martin Exp $	*/
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
  * Copyright (c) 1982, 1986, 1989, 1993
  *      The Regents of the University of California.
+ *
  * 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.
 @@ -26,27 +26,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.
+ *
  *      @(#)vm_meter.c  8.4 (Berkeley) 1/4/94
  * from: Id: uvm_meter.c,v 1.1.2.1 1997/08/14 19:10:35 chuck Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_meter.c,v 1.63 2014/02/26 20:33:53 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_meter.c,v 1.63.4.1 2014/12/17 17:58:03 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/cpu.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <uvm/uvm.h>
 #include <uvm/uvm_pdpolicy.h>
 /*
  * maxslp: ???? XXXCDC
 @@ -113,26 +113,28 @@ sysctl_vm_uvmexp2(SYSCTLFN_ARGS)
 	u.wired = uvmexp.wired;
 	u.zeropages = uvmexp.zeropages;
 	u.reserve_pagedaemon = uvmexp.reserve_pagedaemon;
 	u.reserve_kernel = uvmexp.reserve_kernel;
 	u.freemin = uvmexp.freemin;
 	u.freetarg = uvmexp.freetarg;
 	u.inactarg = 0; /* unused */
 	u.wiredmax = uvmexp.wiredmax;
 	u.nswapdev = uvmexp.nswapdev;
 	u.swpages = uvmexp.swpages;
 	u.swpginuse = uvmexp.swpginuse;
 	u.swpgonly = uvmexp.swpgonly;
 	u.nswget = uvmexp.nswget;
 	u.cpuhit = uvmexp.cpuhit;
 	u.cpumiss = uvmexp.cpumiss;
 	for (CPU_INFO_FOREACH(cii, ci)) {
 		u.faults += ci->ci_data.cpu_nfault;
 		u.traps += ci->ci_data.cpu_ntrap;
 		u.intrs += ci->ci_data.cpu_nintr;
 		u.swtch += ci->ci_data.cpu_nswtch;
 		u.softs += ci->ci_data.cpu_nsoft;
 		u.syscalls += ci->ci_data.cpu_nsyscall;
+	}
 	u.pageins = uvmexp.pageins;
 	u.pgswapin = uvmexp.pgswapin;
 	u.pgswapout = uvmexp.pgswapout;
 	u.forks = uvmexp.forks;
 	u.forks_ppwait = uvmexp.forks_ppwait;
 @@ -164,28 +166,27 @@ sysctl_vm_uvmexp2(SYSCTLFN_ARGS)
 	u.pdscans = uvmexp.pdscans;
 	u.pdanscan = uvmexp.pdanscan;
 	u.pdobscan = uvmexp.pdobscan;
 	u.pdreact = uvmexp.pdreact;
 	u.pdbusy = uvmexp.pdbusy;
 	u.pdpageouts = uvmexp.pdpageouts;
 	u.pdpending = uvmexp.pdpending;
 	u.pddeact = uvmexp.pddeact;
 	u.anonpages = uvmexp.anonpages;
 	u.filepages = uvmexp.filepages;
 	u.execpages = uvmexp.execpages;
 	u.colorhit = uvmexp.colorhit;
 	u.colormiss = uvmexp.colormiss;
-	u.cpuhit = uvmexp.cpuhit;
+	u.ncolors = uvmexp.ncolors;
 	u.cpumiss = uvmexp.cpumiss;
 	node = *rnode;
 	node.sysctl_data = &u;
 	node.sysctl_size = sizeof(u);
 	if (oldlenp)
 		node.sysctl_size = min(*oldlenp, node.sysctl_size);
 	return (sysctl_lookup(SYSCTLFN_CALL(&node)));
+}
 /*
  * sysctl helper routine for uvm_pctparam.
  */
 static int