From owner-svn-src-head@freebsd.org  Mon Apr 17 17:07:05 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 59340D42111;
 Mon, 17 Apr 2017 17:07:05 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 22B8D960;
 Mon, 17 Apr 2017 17:07:05 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3HH74B7010705;
 Mon, 17 Apr 2017 17:07:04 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3HH70TM010666;
 Mon, 17 Apr 2017 17:07:00 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201704171707.v3HH70TM010666@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Mon, 17 Apr 2017 17:07:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r317055 - in head/sys: amd64/amd64 arm/arm arm64/arm64
 cddl/compat/opensolaris/kern cddl/compat/opensolaris/sys
 cddl/contrib/opensolaris/uts/common/fs/zfs compat/linuxkpi/common/include...
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Apr 2017 17:07:05 -0000

Author: glebius
Date: Mon Apr 17 17:07:00 2017
New Revision: 317055
URL: https://svnweb.freebsd.org/changeset/base/317055

Log:
  All these files need sys/vmmeter.h, but now they got it implicitly
  included via sys/pcpu.h.

Modified:
  head/sys/amd64/amd64/efirt.c
  head/sys/amd64/amd64/minidump_machdep.c
  head/sys/amd64/amd64/uma_machdep.c
  head/sys/arm/arm/intr.c
  head/sys/arm/arm/machdep.c
  head/sys/arm/arm/trap-v4.c
  head/sys/arm/arm/trap-v6.c
  head/sys/arm/arm/undefined.c
  head/sys/arm64/arm64/minidump_machdep.c
  head/sys/arm64/arm64/uma_machdep.c
  head/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c
  head/sys/cddl/compat/opensolaris/sys/kmem.h
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  head/sys/compat/linuxkpi/common/include/linux/page.h
  head/sys/dev/drm/drmP.h
  head/sys/dev/drm2/drmP.h
  head/sys/fs/msdosfs/msdosfs_denode.c
  head/sys/fs/msdosfs/msdosfs_vnops.c
  head/sys/kern/kern_mib.c
  head/sys/kern/kern_thread.c
  head/sys/kern/subr_intr.c
  head/sys/kern/subr_syscall.c
  head/sys/mips/include/intr_machdep.h
  head/sys/mips/mips/minidump_machdep.c
  head/sys/mips/mips/uma_machdep.c
  head/sys/ofed/drivers/infiniband/core/umem.c
  head/sys/powerpc/powerpc/uma_machdep.c
  head/sys/sparc64/sparc64/intr_machdep.c
  head/sys/sparc64/sparc64/machdep.c
  head/sys/sparc64/sparc64/mem.c
  head/sys/ufs/ffs/ffs_balloc.c
  head/sys/ufs/ffs/ffs_vfsops.c
  head/sys/vm/device_pager.c
  head/sys/vm/memguard.c
  head/sys/vm/sg_pager.c
  head/sys/vm/vm_reserv.c
  head/sys/x86/x86/intr_machdep.c
  head/sys/x86/xen/xenpv.c

Modified: head/sys/amd64/amd64/efirt.c
==============================================================================
--- head/sys/amd64/amd64/efirt.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/amd64/amd64/efirt.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sched.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
+#include <sys/vmmeter.h>
 #include <machine/fpu.h>
 #include <machine/efi.h>
 #include <machine/metadata.h>

Modified: head/sys/amd64/amd64/minidump_machdep.c
==============================================================================
--- head/sys/amd64/amd64/minidump_machdep.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/amd64/amd64/minidump_machdep.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/msgbuf.h>
 #include <sys/sysctl.h>
 #include <sys/watchdog.h>
+#include <sys/vmmeter.h>
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/vm_page.h>

Modified: head/sys/amd64/amd64/uma_machdep.c
==============================================================================
--- head/sys/amd64/amd64/uma_machdep.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/amd64/amd64/uma_machdep.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/systm.h>
+#include <sys/vmmeter.h>
 #include <vm/vm.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pageout.h>

Modified: head/sys/arm/arm/intr.c
==============================================================================
--- head/sys/arm/arm/intr.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/arm/arm/intr.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/conf.h>
 #include <sys/pmc.h>
 #include <sys/pmckern.h>
+#include <sys/vmmeter.h>
 
 #include <machine/atomic.h>
 #include <machine/bus.h>

Modified: head/sys/arm/arm/machdep.c
==============================================================================
--- head/sys/arm/arm/machdep.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/arm/arm/machdep.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -69,6 +69,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/syscallsubr.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
+#include <sys/vmmeter.h>
 
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>

Modified: head/sys/arm/arm/trap-v4.c
==============================================================================
--- head/sys/arm/arm/trap-v4.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/arm/arm/trap-v4.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -87,6 +87,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/signalvar.h>
+#include <sys/vmmeter.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>

Modified: head/sys/arm/arm/trap-v6.c
==============================================================================
--- head/sys/arm/arm/trap-v6.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/arm/arm/trap-v6.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/mutex.h>
 #include <sys/signalvar.h>
 #include <sys/ktr.h>
+#include <sys/vmmeter.h>
 #ifdef KTRACE
 #include <sys/uio.h>
 #include <sys/ktrace.h>

Modified: head/sys/arm/arm/undefined.c
==============================================================================
--- head/sys/arm/arm/undefined.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/arm/arm/undefined.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/mutex.h>
 #include <sys/signalvar.h>
 #include <sys/ptrace.h>
+#include <sys/vmmeter.h>
 #ifdef KDB
 #include <sys/kdb.h>
 #endif

Modified: head/sys/arm64/arm64/minidump_machdep.c
==============================================================================
--- head/sys/arm64/arm64/minidump_machdep.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/arm64/arm64/minidump_machdep.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/kerneldump.h>
 #include <sys/msgbuf.h>
 #include <sys/watchdog.h>
+#include <sys/vmmeter.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>

Modified: head/sys/arm64/arm64/uma_machdep.c
==============================================================================
--- head/sys/arm64/arm64/uma_machdep.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/arm64/arm64/uma_machdep.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/systm.h>
+#include <sys/vmmeter.h>
 #include <vm/vm.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pageout.h>

Modified: head/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c
==============================================================================
--- head/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/kmem.h>
 #include <sys/debug.h>
 #include <sys/mutex.h>
+#include <sys/vmmeter.h>
 
 #include <vm/vm_page.h>
 #include <vm/vm_object.h>

Modified: head/sys/cddl/compat/opensolaris/sys/kmem.h
==============================================================================
--- head/sys/cddl/compat/opensolaris/sys/kmem.h	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/cddl/compat/opensolaris/sys/kmem.h	Mon Apr 17 17:07:00 2017	(r317055)
@@ -33,6 +33,7 @@
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/vmem.h>
+#include <sys/vmmeter.h>
 
 #include <vm/uma.h>
 #include <vm/vm.h>

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -73,6 +73,7 @@
 #include <sys/buf.h>
 #include <sys/sched.h>
 #include <sys/acl.h>
+#include <sys/vmmeter.h>
 #include <vm/vm_param.h>
 
 /*

Modified: head/sys/compat/linuxkpi/common/include/linux/page.h
==============================================================================
--- head/sys/compat/linuxkpi/common/include/linux/page.h	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/compat/linuxkpi/common/include/linux/page.h	Mon Apr 17 17:07:00 2017	(r317055)
@@ -34,6 +34,7 @@
 #include <linux/types.h>
 
 #include <sys/param.h>
+#include <sys/vmmeter.h>
 
 #include <machine/atomic.h>
 #include <vm/vm.h>

Modified: head/sys/dev/drm/drmP.h
==============================================================================
--- head/sys/dev/drm/drmP.h	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/dev/drm/drmP.h	Mon Apr 17 17:07:00 2017	(r317055)
@@ -65,6 +65,7 @@ struct drm_file;
 #include <sys/poll.h>
 #include <sys/taskqueue.h>
 #include <sys/tree.h>
+#include <sys/vmmeter.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>

Modified: head/sys/dev/drm2/drmP.h
==============================================================================
--- head/sys/dev/drm2/drmP.h	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/dev/drm2/drmP.h	Mon Apr 17 17:07:00 2017	(r317055)
@@ -66,6 +66,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sbuf.h>
 #include <sys/taskqueue.h>
 #include <sys/tree.h>
+#include <sys/vmmeter.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>

Modified: head/sys/fs/msdosfs/msdosfs_denode.c
==============================================================================
--- head/sys/fs/msdosfs/msdosfs_denode.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/fs/msdosfs/msdosfs_denode.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -55,6 +55,7 @@
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
+#include <sys/vmmeter.h>
 #include <sys/vnode.h>
 
 #include <vm/vm.h>

Modified: head/sys/fs/msdosfs/msdosfs_vnops.c
==============================================================================
--- head/sys/fs/msdosfs/msdosfs_vnops.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/fs/msdosfs/msdosfs_vnops.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -64,6 +64,7 @@
 #include <sys/stat.h>
 #include <sys/sysctl.h>
 #include <sys/unistd.h>
+#include <sys/vmmeter.h>
 #include <sys/vnode.h>
 
 #include <vm/vm.h>

Modified: head/sys/kern/kern_mib.c
==============================================================================
--- head/sys/kern/kern_mib.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/kern/kern_mib.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sbuf.h>
 #include <sys/smp.h>
 #include <sys/sx.h>
+#include <sys/vmmeter.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <sys/unistd.h>

Modified: head/sys/kern/kern_thread.c
==============================================================================
--- head/sys/kern/kern_thread.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/kern/kern_thread.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/ktr.h>
 #include <sys/rwlock.h>
 #include <sys/umtx.h>
+#include <sys/vmmeter.h>
 #include <sys/cpuset.h>
 #ifdef	HWPMC_HOOKS
 #include <sys/pmckern.h>

Modified: head/sys/kern/subr_intr.c
==============================================================================
--- head/sys/kern/subr_intr.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/kern/subr_intr.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 #include <sys/sched.h>
 #include <sys/smp.h>
+#include <sys/vmmeter.h>
 #ifdef HWPMC_HOOKS
 #include <sys/pmckern.h>
 #endif

Modified: head/sys/kern/subr_syscall.c
==============================================================================
--- head/sys/kern/subr_syscall.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/kern/subr_syscall.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/capsicum.h>
 #include <sys/ktr.h>
+#include <sys/vmmeter.h
 #ifdef KTRACE
 #include <sys/uio.h>
 #include <sys/ktrace.h>

Modified: head/sys/mips/include/intr_machdep.h
==============================================================================
--- head/sys/mips/include/intr_machdep.h	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/mips/include/intr_machdep.h	Mon Apr 17 17:07:00 2017	(r317055)
@@ -29,6 +29,7 @@
 #ifndef	_MACHINE_INTR_MACHDEP_H_
 #define	_MACHINE_INTR_MACHDEP_H_
 
+#include <sys/vmmeter.h>
 #include <machine/atomic.h>
 
 #if defined(CPU_RMI) || defined(CPU_NLM)

Modified: head/sys/mips/mips/minidump_machdep.c
==============================================================================
--- head/sys/mips/mips/minidump_machdep.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/mips/mips/minidump_machdep.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/kerneldump.h>
 #include <sys/msgbuf.h>
 #include <sys/watchdog.h>
+#include <sys/vmmeter.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <vm/vm_page.h>

Modified: head/sys/mips/mips/uma_machdep.c
==============================================================================
--- head/sys/mips/mips/uma_machdep.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/mips/mips/uma_machdep.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/systm.h>
+#include <sys/vmmeter.h>
 #include <vm/vm.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pageout.h>

Modified: head/sys/ofed/drivers/infiniband/core/umem.c
==============================================================================
--- head/sys/ofed/drivers/infiniband/core/umem.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/ofed/drivers/infiniband/core/umem.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -42,6 +42,7 @@
 #include <linux/module.h>
 #include <sys/priv.h>
 #include <sys/resourcevar.h>
+#include <sys/vmmeter.h>
 #include <vm/vm_pageout.h>
 #include <vm/vm_map.h>
 #include "uverbs.h"

Modified: head/sys/powerpc/powerpc/uma_machdep.c
==============================================================================
--- head/sys/powerpc/powerpc/uma_machdep.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/powerpc/powerpc/uma_machdep.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/mutex.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
+#include <sys/vmmeter.h>
 #include <vm/vm.h>
 #include <vm/vm_page.h>
 #include <vm/vm_kern.h>

Modified: head/sys/sparc64/sparc64/intr_machdep.c
==============================================================================
--- head/sys/sparc64/sparc64/intr_machdep.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/sparc64/sparc64/intr_machdep.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -73,6 +73,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/smp.h>
 #include <sys/sx.h>
+#include <sys/vmmeter.h>
 
 #include <machine/frame.h>
 #include <machine/intr_machdep.h>

Modified: head/sys/sparc64/sparc64/machdep.c
==============================================================================
--- head/sys/sparc64/sparc64/machdep.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/sparc64/sparc64/machdep.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -73,6 +73,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysproto.h>
 #include <sys/timetc.h>
 #include <sys/ucontext.h>
+#include <sys/vmmeter.h>
 
 #include <dev/ofw/openfirm.h>
 

Modified: head/sys/sparc64/sparc64/mem.c
==============================================================================
--- head/sys/sparc64/sparc64/mem.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/sparc64/sparc64/mem.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/signalvar.h>
 #include <sys/systm.h>
 #include <sys/uio.h>
+#include <sys/vmmeter.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>

Modified: head/sys/ufs/ffs/ffs_balloc.c
==============================================================================
--- head/sys/ufs/ffs/ffs_balloc.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/ufs/ffs/ffs_balloc.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -69,6 +69,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/lock.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
+#include <sys/vmmeter.h>
 
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>

Modified: head/sys/ufs/ffs/ffs_vfsops.c
==============================================================================
--- head/sys/ufs/ffs/ffs_vfsops.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/ufs/ffs/ffs_vfsops.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/rwlock.h>
+#include <sys/vmmeter.h>
 
 #include <security/mac/mac_framework.h>
 

Modified: head/sys/vm/device_pager.c
==============================================================================
--- head/sys/vm/device_pager.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/vm/device_pager.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/mman.h>
 #include <sys/rwlock.h>
 #include <sys/sx.h>
+#include <sys/vmmeter.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>

Modified: head/sys/vm/memguard.c
==============================================================================
--- head/sys/vm/memguard.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/vm/memguard.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/sysctl.h>
 #include <sys/vmem.h>
+#include <sys/vmmeter.h>
 
 #include <vm/vm.h>
 #include <vm/uma.h>

Modified: head/sys/vm/sg_pager.c
==============================================================================
--- head/sys/vm/sg_pager.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/vm/sg_pager.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -38,6 +38,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/mutex.h>
 #include <sys/rwlock.h>
 #include <sys/sglist.h>
+#include <sys/vmmeter.h>
+
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/vm_object.h>

Modified: head/sys/vm/vm_reserv.c
==============================================================================
--- head/sys/vm/vm_reserv.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/vm/vm_reserv.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sbuf.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
+#include <sys/vmmeter.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>

Modified: head/sys/x86/x86/intr_machdep.c
==============================================================================
--- head/sys/x86/x86/intr_machdep.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/x86/x86/intr_machdep.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -49,6 +49,7 @@
 #include <sys/sx.h>
 #include <sys/syslog.h>
 #include <sys/systm.h>
+#include <sys/vmmeter.h>
 #include <machine/clock.h>
 #include <machine/intr_machdep.h>
 #include <machine/smp.h>

Modified: head/sys/x86/xen/xenpv.c
==============================================================================
--- head/sys/x86/xen/xenpv.c	Mon Apr 17 16:59:18 2017	(r317054)
+++ head/sys/x86/xen/xenpv.c	Mon Apr 17 17:07:00 2017	(r317055)
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 #include <sys/smp.h>
 #include <sys/limits.h>
+#include <sys/vmmeter.h>
 
 #include <vm/vm.h>
 #include <vm/vm_page.h>