[src/netbsd-7]: src/usr.bin/vmstat Pull up following revision(s) (requested b...

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

details:   https://anonhg.NetBSD.org/src/rev/0557fc239577
branches:  netbsd-7
changeset: 798550:0557fc239577
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Nov 12 14:14:13 2014 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #221):
        usr.bin/vmstat/vmstat.c: revision 1.204
Print the cpu in the kernhist record.

diffstat:

 usr.bin/vmstat/vmstat.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 2d4e90bd0e1c -r 0557fc239577 usr.bin/vmstat/vmstat.c
--- a/usr.bin/vmstat/vmstat.c   Wed Nov 12 14:09:57 2014 +0000
+++ b/usr.bin/vmstat/vmstat.c   Wed Nov 12 14:14:13 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vmstat.c,v 1.203 2014/07/12 20:04:31 nakayama Exp $ */
+/* $NetBSD: vmstat.c,v 1.203.2.1 2014/11/12 14:14:13 martin Exp $ */
 
 /*-
  * Copyright (c) 1998, 2000, 2001, 2007 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
 #if 0
 static char sccsid[] = "@(#)vmstat.c   8.2 (Berkeley) 3/1/95";
 #else
-__RCSID("$NetBSD: vmstat.c,v 1.203 2014/07/12 20:04:31 nakayama Exp $");
+__RCSID("$NetBSD: vmstat.c,v 1.203.2.1 2014/11/12 14:14:13 martin Exp $");
 #endif
 #endif /* not lint */
 
@@ -2118,7 +2118,7 @@
 
                        (void)printf("%06ld.%06ld ", (long int)e->tv.tv_sec,
                            (long int)e->tv.tv_usec);
-                       (void)printf("%s#%ld: ", fn, e->call);
+                       (void)printf("%s#%ld@%d: ", fn, e->call, e->cpunum);
                        (void)printf(fmt, e->v[0], e->v[1], e->v[2], e->v[3]);
                        (void)putchar('\n');
                }