[src/netbsd-8]: src Pull up following revision(s) (requested by pgoyette in t...

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

details:   https://anonhg.NetBSD.org/src/rev/84eb9dc9d41d
branches:  netbsd-8
changeset: 851100:84eb9dc9d41d
user:      snj <snj%NetBSD.org@localhost>
date:      Mon Nov 06 09:55:56 2017 +0000

description:
Pull up following revision(s) (requested by pgoyette in ticket #343):
        sys/kern/kern_history.c: revision 1.16
        sys/sys/kernhist.h: revision 1.22
        usr.bin/vmstat/vmstat.c: revision 1.220
Remove the ABI version-and-length check that was recently introduced;
sysctl(9) ABIs should be stable across versions.

diffstat:

 sys/kern/kern_history.c |  10 ++--------
 sys/sys/kernhist.h      |   5 ++---
 usr.bin/vmstat/vmstat.c |   9 ++-------
 3 files changed, 6 insertions(+), 18 deletions(-)

diffs (80 lines):

diff -r 2c72594c841a -r 84eb9dc9d41d sys/kern/kern_history.c
--- a/sys/kern/kern_history.c   Mon Nov 06 09:54:01 2017 +0000
+++ b/sys/kern/kern_history.c   Mon Nov 06 09:55:56 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_history.c,v 1.14.8.1 2017/11/02 21:29:52 snj Exp $         */
+/*     $NetBSD: kern_history.c,v 1.14.8.2 2017/11/06 09:55:57 snj Exp $         */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_history.c,v 1.14.8.1 2017/11/02 21:29:52 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_history.c,v 1.14.8.2 2017/11/06 09:55:57 snj Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kernhist.h"
@@ -460,12 +460,6 @@
        buf = kmem_alloc(bufsize, KM_SLEEP);
 
        /*
-        * Set the export structure's version info
-        */
-       buf->sh_version = KERNHIST_SYSCTL_VERSION;
-       buf->sh_arglen = sizeof(uintmax_t);
-
-       /*
         * Copy history header info to the export structure
         */
        j = find_string(xlate_t, &xlate_c, h->name, h->namelen);
diff -r 2c72594c841a -r 84eb9dc9d41d sys/sys/kernhist.h
--- a/sys/sys/kernhist.h        Mon Nov 06 09:54:01 2017 +0000
+++ b/sys/sys/kernhist.h        Mon Nov 06 09:55:56 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kernhist.h,v 1.18.8.2 2017/11/02 21:29:52 snj Exp $    */
+/*     $NetBSD: kernhist.h,v 1.18.8.3 2017/11/06 09:55:57 snj Exp $    */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -89,8 +89,7 @@
 
 /* list of all events for a single history */
 struct sysctl_history {
-       uint16_t        sh_version;
-       uint16_t        sh_arglen;
+       uint32_t        filler;
        uint32_t        sh_nameoffset;
        uint32_t        sh_numentries;
        uint32_t        sh_nextfree;
diff -r 2c72594c841a -r 84eb9dc9d41d usr.bin/vmstat/vmstat.c
--- a/usr.bin/vmstat/vmstat.c   Mon Nov 06 09:54:01 2017 +0000
+++ b/usr.bin/vmstat/vmstat.c   Mon Nov 06 09:55:56 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vmstat.c,v 1.216.6.2 2017/11/02 21:29:53 snj Exp $ */
+/* $NetBSD: vmstat.c,v 1.216.6.3 2017/11/06 09:55:56 snj 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.216.6.2 2017/11/02 21:29:53 snj Exp $");
+__RCSID("$NetBSD: vmstat.c,v 1.216.6.3 2017/11/06 09:55:56 snj Exp $");
 #endif
 #endif /* not lint */
 
@@ -2273,11 +2273,6 @@
        if (errno != 0)
                err(1, "sysctl failed");
  
-       /* Make sure we've got matching versions */
-       if (hist->sh_version != KERNHIST_SYSCTL_VERSION ||
-           hist->sh_arglen != sizeof(uintmax_t))
-               errx(1, "Kernel version or argument length mismatch!");
-
        strp = (char *)(&hist->sh_events[hist->sh_numentries]);
  
        (void)printf("%"PRIu32" entries, next is %"PRIu32"\n",