Module Name: src
Committed By: martin
Date: Wed Dec 17 17:58:03 UTC 2014
Modified Files:
src/sys/uvm [netbsd-7]: uvm_meter.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #329):
sys/uvm/uvm_meter.c: revision 1.64
sys/uvm/uvm_meter.c: revision 1.65
Fix a bug that "vmstat -s" prints uvmexp.ncolors incorrectly.
Sort in uvmexp_sysctl's order for readability. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.63.4.1 src/sys/uvm/uvm_meter.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/uvm/uvm_meter.c
diff -u src/sys/uvm/uvm_meter.c:1.63 src/sys/uvm/uvm_meter.c:1.63.4.1
--- src/sys/uvm/uvm_meter.c:1.63 Wed Feb 26 20:33:53 2014
+++ src/sys/uvm/uvm_meter.c Wed Dec 17 17:58:03 2014
@@ -1,4 +1,4 @@
-/* $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.
@@ -36,7 +36,7 @@
*/
#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>
@@ -123,6 +123,8 @@ sysctl_vm_uvmexp2(SYSCTLFN_ARGS)
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;
@@ -174,8 +176,7 @@ sysctl_vm_uvmexp2(SYSCTLFN_ARGS)
u.execpages = uvmexp.execpages;
u.colorhit = uvmexp.colorhit;
u.colormiss = uvmexp.colormiss;
- u.cpuhit = uvmexp.cpuhit;
- u.cpumiss = uvmexp.cpumiss;
+ u.ncolors = uvmexp.ncolors;
node = *rnode;
node.sysctl_data = &u;
