[src/netbsd-6]: src Pull up following revision(s) (requested by martin in tic...

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

details:   https://anonhg.NetBSD.org/src/rev/83eb3f47d259
branches:  netbsd-6
changeset: 774191:83eb3f47d259
user:      riz <riz%NetBSD.org@localhost>
date:      Tue Jun 12 17:18:22 2012 +0000

description:
Pull up following revision(s) (requested by martin in ticket #310):
        sys/kern/kern_proc.c: revision 1.184
        lib/libkvm/kvm_proc.c: revision 1.89
Measure kinfo_proc2::p_vm_vsize in pages, as it was always documented.
This value seems to never have been used anywhere.
This makes it consistent with it's cousin p_vm_msize (which is in pages as
well and has several uses).

diffstat:

 lib/libkvm/kvm_proc.c |  7 ++++---
 sys/kern/kern_proc.c  |  6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diffs (55 lines):

diff -r 0718b868537f -r 83eb3f47d259 lib/libkvm/kvm_proc.c
--- a/lib/libkvm/kvm_proc.c     Tue Jun 12 17:16:28 2012 +0000
+++ b/lib/libkvm/kvm_proc.c     Tue Jun 12 17:18:22 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kvm_proc.c,v 1.88 2010/11/12 04:52:08 uebayasi Exp $   */
+/*     $NetBSD: kvm_proc.c,v 1.88.8.1 2012/06/12 17:18:22 riz Exp $    */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 #if 0
 static char sccsid[] = "@(#)kvm_proc.c 8.3 (Berkeley) 9/23/93";
 #else
-__RCSID("$NetBSD: kvm_proc.c,v 1.88 2010/11/12 04:52:08 uebayasi Exp $");
+__RCSID("$NetBSD: kvm_proc.c,v 1.88.8.1 2012/06/12 17:18:22 riz Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -657,7 +657,8 @@
                        kp2p->p_vm_tsize = kp->kp_eproc.e_vm.vm_tsize;
                        kp2p->p_vm_dsize = kp->kp_eproc.e_vm.vm_dsize;
                        kp2p->p_vm_ssize = kp->kp_eproc.e_vm.vm_ssize;
-                       kp2p->p_vm_vsize = kp->kp_eproc.e_vm.vm_map.size;
+                       kp2p->p_vm_vsize = kp->kp_eproc.e_vm.vm_map.size
+                           / kd->nbpg;
                        /* Adjust mapped size */
                        kp2p->p_vm_msize =
                            (kp->kp_eproc.e_vm.vm_map.size / kd->nbpg) -
diff -r 0718b868537f -r 83eb3f47d259 sys/kern/kern_proc.c
--- a/sys/kern/kern_proc.c      Tue Jun 12 17:16:28 2012 +0000
+++ b/sys/kern/kern_proc.c      Tue Jun 12 17:18:22 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_proc.c,v 1.181 2012/02/11 23:16:17 martin Exp $   */
+/*     $NetBSD: kern_proc.c,v 1.181.2.1 2012/06/12 17:18:22 riz Exp $  */
 
 /*-
  * Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.181 2012/02/11 23:16:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.181.2.1 2012/06/12 17:18:22 riz Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_kstack.h"
@@ -2277,7 +2277,7 @@
                ki->p_vm_tsize = vm->vm_tsize;
                ki->p_vm_dsize = vm->vm_dsize;
                ki->p_vm_ssize = vm->vm_ssize;
-               ki->p_vm_vsize = vm->vm_map.size;
+               ki->p_vm_vsize = atop(vm->vm_map.size);
                /*
                 * Since the stack is initially mapped mostly with
                 * PROT_NONE and grown as needed, adjust the "mapped size"