Author: kevans Date: Thu Mar 15 19:08:33 2018 New Revision: 331017 URL: https://svnweb.freebsd.org/changeset/base/331017
Log: MFC r317055,r317056 (glebius): Include sys/vmmeter.h as included r317055: All these files need sys/vmmeter.h, but now they got it implicitly included via sys/pcpu.h. r317056: Typo! Modified: stable/11/sys/amd64/amd64/efirt.c stable/11/sys/amd64/amd64/minidump_machdep.c stable/11/sys/amd64/amd64/uma_machdep.c stable/11/sys/arm/arm/intr.c stable/11/sys/arm/arm/machdep.c stable/11/sys/arm/arm/trap-v4.c stable/11/sys/arm/arm/trap-v6.c stable/11/sys/arm/arm/undefined.c stable/11/sys/arm64/arm64/minidump_machdep.c stable/11/sys/arm64/arm64/uma_machdep.c stable/11/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c stable/11/sys/cddl/compat/opensolaris/sys/kmem.h stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c stable/11/sys/dev/drm/drmP.h stable/11/sys/dev/drm2/drmP.h stable/11/sys/fs/msdosfs/msdosfs_denode.c stable/11/sys/fs/msdosfs/msdosfs_vnops.c stable/11/sys/kern/kern_mib.c stable/11/sys/kern/kern_thread.c stable/11/sys/kern/subr_intr.c stable/11/sys/kern/subr_syscall.c stable/11/sys/mips/include/intr_machdep.h stable/11/sys/mips/mips/minidump_machdep.c stable/11/sys/mips/mips/uma_machdep.c stable/11/sys/ofed/drivers/infiniband/core/umem.c stable/11/sys/powerpc/powerpc/uma_machdep.c stable/11/sys/sparc64/sparc64/intr_machdep.c stable/11/sys/sparc64/sparc64/machdep.c stable/11/sys/sparc64/sparc64/mem.c stable/11/sys/ufs/ffs/ffs_balloc.c stable/11/sys/ufs/ffs/ffs_vfsops.c stable/11/sys/vm/device_pager.c stable/11/sys/vm/memguard.c stable/11/sys/vm/sg_pager.c stable/11/sys/vm/vm_reserv.c stable/11/sys/x86/x86/intr_machdep.c stable/11/sys/x86/xen/xenpv.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/amd64/amd64/efirt.c ============================================================================== --- stable/11/sys/amd64/amd64/efirt.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/amd64/amd64/efirt.c Thu Mar 15 19:08:33 2018 (r331017) @@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$"); #include <sys/sched.h> #include <sys/sysctl.h> #include <sys/systm.h> +#include <sys/vmmeter.h> #include <isa/rtc.h> #include <machine/fpu.h> #include <machine/efi.h> Modified: stable/11/sys/amd64/amd64/minidump_machdep.c ============================================================================== --- stable/11/sys/amd64/amd64/minidump_machdep.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/amd64/amd64/minidump_machdep.c Thu Mar 15 19:08:33 2018 (r331017) @@ -40,6 +40,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> #include <vm/vm_page.h> Modified: stable/11/sys/amd64/amd64/uma_machdep.c ============================================================================== --- stable/11/sys/amd64/amd64/uma_machdep.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/amd64/amd64/uma_machdep.c Thu Mar 15 19:08:33 2018 (r331017) @@ -34,6 +34,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: stable/11/sys/arm/arm/intr.c ============================================================================== --- stable/11/sys/arm/arm/intr.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/arm/arm/intr.c Thu Mar 15 19:08:33 2018 (r331017) @@ -55,6 +55,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: stable/11/sys/arm/arm/machdep.c ============================================================================== --- stable/11/sys/arm/arm/machdep.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/arm/arm/machdep.c Thu Mar 15 19:08:33 2018 (r331017) @@ -71,6 +71,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: stable/11/sys/arm/arm/trap-v4.c ============================================================================== --- stable/11/sys/arm/arm/trap-v4.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/arm/arm/trap-v4.c Thu Mar 15 19:08:33 2018 (r331017) @@ -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: stable/11/sys/arm/arm/trap-v6.c ============================================================================== --- stable/11/sys/arm/arm/trap-v6.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/arm/arm/trap-v6.c Thu Mar 15 19:08:33 2018 (r331017) @@ -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: stable/11/sys/arm/arm/undefined.c ============================================================================== --- stable/11/sys/arm/arm/undefined.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/arm/arm/undefined.c Thu Mar 15 19:08:33 2018 (r331017) @@ -64,6 +64,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: stable/11/sys/arm64/arm64/minidump_machdep.c ============================================================================== --- stable/11/sys/arm64/arm64/minidump_machdep.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/arm64/arm64/minidump_machdep.c Thu Mar 15 19:08:33 2018 (r331017) @@ -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: stable/11/sys/arm64/arm64/uma_machdep.c ============================================================================== --- stable/11/sys/arm64/arm64/uma_machdep.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/arm64/arm64/uma_machdep.c Thu Mar 15 19:08:33 2018 (r331017) @@ -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: stable/11/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c ============================================================================== --- stable/11/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c Thu Mar 15 19:08:33 2018 (r331017) @@ -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: stable/11/sys/cddl/compat/opensolaris/sys/kmem.h ============================================================================== --- stable/11/sys/cddl/compat/opensolaris/sys/kmem.h Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/cddl/compat/opensolaris/sys/kmem.h Thu Mar 15 19:08:33 2018 (r331017) @@ -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: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Thu Mar 15 19:08:33 2018 (r331017) @@ -74,6 +74,7 @@ #include <sys/buf.h> #include <sys/sched.h> #include <sys/acl.h> +#include <sys/vmmeter.h> #include <vm/vm_param.h> #include <sys/zil.h> Modified: stable/11/sys/dev/drm/drmP.h ============================================================================== --- stable/11/sys/dev/drm/drmP.h Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/dev/drm/drmP.h Thu Mar 15 19:08:33 2018 (r331017) @@ -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: stable/11/sys/dev/drm2/drmP.h ============================================================================== --- stable/11/sys/dev/drm2/drmP.h Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/dev/drm2/drmP.h Thu Mar 15 19:08:33 2018 (r331017) @@ -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: stable/11/sys/fs/msdosfs/msdosfs_denode.c ============================================================================== --- stable/11/sys/fs/msdosfs/msdosfs_denode.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/fs/msdosfs/msdosfs_denode.c Thu Mar 15 19:08:33 2018 (r331017) @@ -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: stable/11/sys/fs/msdosfs/msdosfs_vnops.c ============================================================================== --- stable/11/sys/fs/msdosfs/msdosfs_vnops.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/fs/msdosfs/msdosfs_vnops.c Thu Mar 15 19:08:33 2018 (r331017) @@ -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: stable/11/sys/kern/kern_mib.c ============================================================================== --- stable/11/sys/kern/kern_mib.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/kern/kern_mib.c Thu Mar 15 19:08:33 2018 (r331017) @@ -54,6 +54,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: stable/11/sys/kern/kern_thread.c ============================================================================== --- stable/11/sys/kern/kern_thread.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/kern/kern_thread.c Thu Mar 15 19:08:33 2018 (r331017) @@ -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: stable/11/sys/kern/subr_intr.c ============================================================================== --- stable/11/sys/kern/subr_intr.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/kern/subr_intr.c Thu Mar 15 19:08:33 2018 (r331017) @@ -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: stable/11/sys/kern/subr_syscall.c ============================================================================== --- stable/11/sys/kern/subr_syscall.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/kern/subr_syscall.c Thu Mar 15 19:08:33 2018 (r331017) @@ -47,6 +47,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: stable/11/sys/mips/include/intr_machdep.h ============================================================================== --- stable/11/sys/mips/include/intr_machdep.h Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/mips/include/intr_machdep.h Thu Mar 15 19:08:33 2018 (r331017) @@ -31,6 +31,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: stable/11/sys/mips/mips/minidump_machdep.c ============================================================================== --- stable/11/sys/mips/mips/minidump_machdep.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/mips/mips/minidump_machdep.c Thu Mar 15 19:08:33 2018 (r331017) @@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/kerneldump.h> #include <sys/msgbuf.h> +#include <sys/vmmeter.h> #include <vm/vm.h> #include <vm/pmap.h> #include <machine/atomic.h> Modified: stable/11/sys/mips/mips/uma_machdep.c ============================================================================== --- stable/11/sys/mips/mips/uma_machdep.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/mips/mips/uma_machdep.c Thu Mar 15 19:08:33 2018 (r331017) @@ -34,6 +34,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: stable/11/sys/ofed/drivers/infiniband/core/umem.c ============================================================================== --- stable/11/sys/ofed/drivers/infiniband/core/umem.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/ofed/drivers/infiniband/core/umem.c Thu Mar 15 19:08:33 2018 (r331017) @@ -43,6 +43,7 @@ #include <linux/wait.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: stable/11/sys/powerpc/powerpc/uma_machdep.c ============================================================================== --- stable/11/sys/powerpc/powerpc/uma_machdep.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/powerpc/powerpc/uma_machdep.c Thu Mar 15 19:08:33 2018 (r331017) @@ -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: stable/11/sys/sparc64/sparc64/intr_machdep.c ============================================================================== --- stable/11/sys/sparc64/sparc64/intr_machdep.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/sparc64/sparc64/intr_machdep.c Thu Mar 15 19:08:33 2018 (r331017) @@ -75,6 +75,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: stable/11/sys/sparc64/sparc64/machdep.c ============================================================================== --- stable/11/sys/sparc64/sparc64/machdep.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/sparc64/sparc64/machdep.c Thu Mar 15 19:08:33 2018 (r331017) @@ -75,6 +75,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: stable/11/sys/sparc64/sparc64/mem.c ============================================================================== --- stable/11/sys/sparc64/sparc64/mem.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/sparc64/sparc64/mem.c Thu Mar 15 19:08:33 2018 (r331017) @@ -63,6 +63,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: stable/11/sys/ufs/ffs/ffs_balloc.c ============================================================================== --- stable/11/sys/ufs/ffs/ffs_balloc.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/ufs/ffs/ffs_balloc.c Thu Mar 15 19:08:33 2018 (r331017) @@ -71,6 +71,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: stable/11/sys/ufs/ffs/ffs_vfsops.c ============================================================================== --- stable/11/sys/ufs/ffs/ffs_vfsops.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/ufs/ffs/ffs_vfsops.c Thu Mar 15 19:08:33 2018 (r331017) @@ -56,6 +56,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: stable/11/sys/vm/device_pager.c ============================================================================== --- stable/11/sys/vm/device_pager.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/vm/device_pager.c Thu Mar 15 19:08:33 2018 (r331017) @@ -48,6 +48,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: stable/11/sys/vm/memguard.c ============================================================================== --- stable/11/sys/vm/memguard.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/vm/memguard.c Thu Mar 15 19:08:33 2018 (r331017) @@ -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: stable/11/sys/vm/sg_pager.c ============================================================================== --- stable/11/sys/vm/sg_pager.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/vm/sg_pager.c Thu Mar 15 19:08:33 2018 (r331017) @@ -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: stable/11/sys/vm/vm_reserv.c ============================================================================== --- stable/11/sys/vm/vm_reserv.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/vm/vm_reserv.c Thu Mar 15 19:08:33 2018 (r331017) @@ -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: stable/11/sys/x86/x86/intr_machdep.c ============================================================================== --- stable/11/sys/x86/x86/intr_machdep.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/x86/x86/intr_machdep.c Thu Mar 15 19:08:33 2018 (r331017) @@ -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: stable/11/sys/x86/xen/xenpv.c ============================================================================== --- stable/11/sys/x86/xen/xenpv.c Thu Mar 15 19:03:54 2018 (r331016) +++ stable/11/sys/x86/xen/xenpv.c Thu Mar 15 19:08:33 2018 (r331017) @@ -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> _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"