[src/netbsd-7]: src/sys/uvm Pull up following revision(s) (requested by msait...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/90c67fb55701
branches:  netbsd-7
changeset: 798720:90c67fb55701
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Dec 17 17:58:03 2014 +0000

description:
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.

diffstat:

 sys/uvm/uvm_meter.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r d5425462e21e -r 90c67fb55701 sys/uvm/uvm_meter.c
--- a/sys/uvm/uvm_meter.c       Tue Dec 16 16:21:35 2014 +0000
+++ b/sys/uvm/uvm_meter.c       Wed Dec 17 17:58:03 2014 +0000
@@ -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 @@
        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 @@
        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;