Module Name: src
Committed By: riastradh
Date: Sat Sep 5 16:30:13 UTC 2020
Modified Files:
src/sys/arch/aarch64/include: asan.h
src/sys/arch/amd64/include: asan.h
src/sys/arch/arm/include: asan.h
src/sys/compat/common: uvm_13.c uvm_50.c
src/sys/compat/linux/arch/amd64: linux_exec_machdep.c
src/sys/compat/linux/arch/i386: linux_exec_machdep.c
src/sys/compat/netbsd32: netbsd32_kern_proc.c
src/sys/dev: kloader.c
src/sys/dev/bus_dma: bus_dmamem_common.c
src/sys/dev/ic: ssdfb.c sti.c
src/sys/dev/marvell: if_gfe.c
src/sys/dev/nvmm: nvmm.c
src/sys/dev/nvmm/x86: nvmm_x86.c nvmm_x86_svm.c nvmm_x86_vmx.c
src/sys/dev/sbus: genfb_sbus.c
src/sys/dev/usb: udl.c
src/sys/external/bsd/sljit/dist/sljit_src: sljitExecAllocator.c
sljitUtils.c
src/sys/fs/tmpfs: tmpfs_subr.c tmpfs_vnops.c
src/sys/kern: kern_idle.c kern_proc.c subr_asan.c subr_msan.c
src/sys/miscfs/genfs: genfs_vnops.c
src/sys/miscfs/procfs: procfs_linux.c
src/sys/modules/examples/mapper: mapper.c
src/sys/nfs: nfs_bio.c nfs_kq.c nfs_serv.c nfs_subs.c nfs_vnops.c
src/sys/rump/dev/lib/libpci: rumpdev_bus_dma.c
src/sys/ufs/chfs: chfs_pool.c chfs_subr.c chfs_vfsops.c chfs_vnops.c
src/sys/ufs/ext2fs: ext2fs_balloc.c
src/sys/ufs/ffs: ffs_alloc.c ffs_balloc.c ffs_extattr.c ffs_vnops.c
src/sys/ufs/lfs: lfs_balloc.c lfs_bio.c lfs_pages.c lfs_rename.c
lfs_rfw.c lfs_segment.c lfs_subr.c lfs_vfsops.c lfs_vnops.c
ulfs_inode.c ulfs_snapshot.c ulfs_vnops.c
src/sys/ufs/ufs: ufs_inode.c ufs_vnops.c
src/sys/uvm: uvm_device.h uvm_pdaemon.h uvm_swap.h
Log Message:
Round of uvm.h cleanup.
The poorly named uvm.h is generally supposed to be for uvm-internal
users only.
- Narrow it to files that actually need it -- mostly files that need
to query whether curlwp is the pagedaemon, which should maybe be
exposed by an external header.
- Use uvm_extern.h where feasible and uvm_*.h for things not exposed
by it. We should split up uvm_extern.h but this will serve for now
to reduce the uvm.h dependencies.
- Use uvm_stat.h and #ifdef UVMHIST uvm.h for files that use
UVMHIST(ubchist), since ubchist is declared in uvm.h but the
reference evaporates if UVMHIST is not defined, so we reduce header
file dependencies.
- Make uvm_device.h and uvm_swap.h independently includable while
here.
ok chs@
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/aarch64/include/asan.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amd64/include/asan.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/include/asan.h
cvs rdiff -u -r1.2 -r1.3 src/sys/compat/common/uvm_13.c \
src/sys/compat/common/uvm_50.c
cvs rdiff -u -r1.23 -r1.24 \
src/sys/compat/linux/arch/amd64/linux_exec_machdep.c
cvs rdiff -u -r1.19 -r1.20 \
src/sys/compat/linux/arch/i386/linux_exec_machdep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/compat/netbsd32/netbsd32_kern_proc.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/kloader.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/bus_dma/bus_dmamem_common.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/ic/ssdfb.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/ic/sti.c
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/marvell/if_gfe.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/nvmm/nvmm.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/nvmm/x86/nvmm_x86.c
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/nvmm/x86/nvmm_x86_svm.c
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/sbus/genfb_sbus.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/usb/udl.c
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/sljit/dist/sljit_src/sljitExecAllocator.c
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/sljit/dist/sljit_src/sljitUtils.c
cvs rdiff -u -r1.112 -r1.113 src/sys/fs/tmpfs/tmpfs_subr.c
cvs rdiff -u -r1.143 -r1.144 src/sys/fs/tmpfs/tmpfs_vnops.c
cvs rdiff -u -r1.33 -r1.34 src/sys/kern/kern_idle.c
cvs rdiff -u -r1.259 -r1.260 src/sys/kern/kern_proc.c
cvs rdiff -u -r1.24 -r1.25 src/sys/kern/subr_asan.c
cvs rdiff -u -r1.12 -r1.13 src/sys/kern/subr_msan.c
cvs rdiff -u -r1.209 -r1.210 src/sys/miscfs/genfs/genfs_vnops.c
cvs rdiff -u -r1.86 -r1.87 src/sys/miscfs/procfs/procfs_linux.c
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/examples/mapper/mapper.c
cvs rdiff -u -r1.198 -r1.199 src/sys/nfs/nfs_bio.c
cvs rdiff -u -r1.26 -r1.27 src/sys/nfs/nfs_kq.c
cvs rdiff -u -r1.180 -r1.181 src/sys/nfs/nfs_serv.c
cvs rdiff -u -r1.240 -r1.241 src/sys/nfs/nfs_subs.c
cvs rdiff -u -r1.316 -r1.317 src/sys/nfs/nfs_vnops.c
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c
cvs rdiff -u -r1.4 -r1.5 src/sys/ufs/chfs/chfs_pool.c
cvs rdiff -u -r1.14 -r1.15 src/sys/ufs/chfs/chfs_subr.c
cvs rdiff -u -r1.21 -r1.22 src/sys/ufs/chfs/chfs_vfsops.c
cvs rdiff -u -r1.41 -r1.42 src/sys/ufs/chfs/chfs_vnops.c
cvs rdiff -u -r1.42 -r1.43 src/sys/ufs/ext2fs/ext2fs_balloc.c
cvs rdiff -u -r1.168 -r1.169 src/sys/ufs/ffs/ffs_alloc.c
cvs rdiff -u -r1.64 -r1.65 src/sys/ufs/ffs/ffs_balloc.c
cvs rdiff -u -r1.6 -r1.7 src/sys/ufs/ffs/ffs_extattr.c
cvs rdiff -u -r1.132 -r1.133 src/sys/ufs/ffs/ffs_vnops.c
cvs rdiff -u -r1.95 -r1.96 src/sys/ufs/lfs/lfs_balloc.c
cvs rdiff -u -r1.148 -r1.149 src/sys/ufs/lfs/lfs_bio.c
cvs rdiff -u -r1.25 -r1.26 src/sys/ufs/lfs/lfs_pages.c \
src/sys/ufs/lfs/ulfs_inode.c
cvs rdiff -u -r1.23 -r1.24 src/sys/ufs/lfs/lfs_rename.c
cvs rdiff -u -r1.35 -r1.36 src/sys/ufs/lfs/lfs_rfw.c
cvs rdiff -u -r1.287 -r1.288 src/sys/ufs/lfs/lfs_segment.c
cvs rdiff -u -r1.102 -r1.103 src/sys/ufs/lfs/lfs_subr.c
cvs rdiff -u -r1.379 -r1.380 src/sys/ufs/lfs/lfs_vfsops.c
cvs rdiff -u -r1.335 -r1.336 src/sys/ufs/lfs/lfs_vnops.c
cvs rdiff -u -r1.3 -r1.4 src/sys/ufs/lfs/ulfs_snapshot.c
cvs rdiff -u -r1.53 -r1.54 src/sys/ufs/lfs/ulfs_vnops.c
cvs rdiff -u -r1.111 -r1.112 src/sys/ufs/ufs/ufs_inode.c
cvs rdiff -u -r1.258 -r1.259 src/sys/ufs/ufs/ufs_vnops.c
cvs rdiff -u -r1.13 -r1.14 src/sys/uvm/uvm_device.h
cvs rdiff -u -r1.19 -r1.20 src/sys/uvm/uvm_pdaemon.h
cvs rdiff -u -r1.25 -r1.26 src/sys/uvm/uvm_swap.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/include/asan.h
diff -u src/sys/arch/aarch64/include/asan.h:1.9 src/sys/arch/aarch64/include/asan.h:1.10
--- src/sys/arch/aarch64/include/asan.h:1.9 Sat Aug 1 06:35:00 2020
+++ src/sys/arch/aarch64/include/asan.h Sat Sep 5 16:30:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: asan.h,v 1.9 2020/08/01 06:35:00 maxv Exp $ */
+/* $NetBSD: asan.h,v 1.10 2020/09/05 16:30:10 riastradh Exp $ */
/*
* Copyright (c) 2018-2020 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
#include <sys/atomic.h>
#include <sys/ksyms.h>
+#include <uvm/uvm.h>
+
#include <aarch64/pmap.h>
#include <aarch64/vmparam.h>
#include <aarch64/cpufunc.h>
Index: src/sys/arch/amd64/include/asan.h
diff -u src/sys/arch/amd64/include/asan.h:1.7 src/sys/arch/amd64/include/asan.h:1.8
--- src/sys/arch/amd64/include/asan.h:1.7 Tue Jun 23 17:21:55 2020
+++ src/sys/arch/amd64/include/asan.h Sat Sep 5 16:30:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: asan.h,v 1.7 2020/06/23 17:21:55 maxv Exp $ */
+/* $NetBSD: asan.h,v 1.8 2020/09/05 16:30:10 riastradh Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -31,6 +31,8 @@
#include <sys/ksyms.h>
+#include <uvm/uvm.h>
+
#include <amd64/pmap.h>
#include <amd64/vmparam.h>
Index: src/sys/arch/arm/include/asan.h
diff -u src/sys/arch/arm/include/asan.h:1.4 src/sys/arch/arm/include/asan.h:1.5
--- src/sys/arch/arm/include/asan.h:1.4 Fri Aug 28 13:36:52 2020
+++ src/sys/arch/arm/include/asan.h Sat Sep 5 16:30:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: asan.h,v 1.4 2020/08/28 13:36:52 skrll Exp $ */
+/* $NetBSD: asan.h,v 1.5 2020/09/05 16:30:10 riastradh Exp $ */
/*
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
#include <sys/atomic.h>
#include <sys/ksyms.h>
+#include <uvm/uvm.h>
+
#include <arm/vmparam.h>
#include <arm/arm32/machdep.h>
#include <arm/arm32/pmap.h>
Index: src/sys/compat/common/uvm_13.c
diff -u src/sys/compat/common/uvm_13.c:1.2 src/sys/compat/common/uvm_13.c:1.3
--- src/sys/compat/common/uvm_13.c:1.2 Sun Jan 27 02:08:39 2019
+++ src/sys/compat/common/uvm_13.c Sat Sep 5 16:30:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_13.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $ */
+/* $NetBSD: uvm_13.c,v 1.3 2020/09/05 16:30:10 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_13.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_13.c,v 1.3 2020/09/05 16:30:10 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: uvm_13.c,v 1
#include <sys/systm.h>
#include <sys/syscallargs.h>
#include <sys/swap.h>
-#include <uvm/uvm.h>
+
#include <uvm/uvm_swap.h>
#include <compat/sys/uvm.h>
Index: src/sys/compat/common/uvm_50.c
diff -u src/sys/compat/common/uvm_50.c:1.2 src/sys/compat/common/uvm_50.c:1.3
--- src/sys/compat/common/uvm_50.c:1.2 Sun Jan 27 02:08:39 2019
+++ src/sys/compat/common/uvm_50.c Sat Sep 5 16:30:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_50.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $ */
+/* $NetBSD: uvm_50.c,v 1.3 2020/09/05 16:30:10 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_50.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_50.c,v 1.3 2020/09/05 16:30:10 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -49,7 +49,8 @@ __KERNEL_RCSID(0, "$NetBSD: uvm_50.c,v 1
#include <sys/systm.h>
#include <sys/syscallargs.h>
#include <sys/swap.h>
-#include <uvm/uvm.h>
+
+#include <uvm/uvm_swap.h>
#include <compat/sys/uvm.h>
Index: src/sys/compat/linux/arch/amd64/linux_exec_machdep.c
diff -u src/sys/compat/linux/arch/amd64/linux_exec_machdep.c:1.23 src/sys/compat/linux/arch/amd64/linux_exec_machdep.c:1.24
--- src/sys/compat/linux/arch/amd64/linux_exec_machdep.c:1.23 Sun Jan 12 18:30:58 2020
+++ src/sys/compat/linux/arch/amd64/linux_exec_machdep.c Sat Sep 5 16:30:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_exec_machdep.c,v 1.23 2020/01/12 18:30:58 ad Exp $ */
+/* $NetBSD: linux_exec_machdep.c,v 1.24 2020/09/05 16:30:10 riastradh Exp $ */
/*-
* Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_exec_machdep.c,v 1.23 2020/01/12 18:30:58 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_exec_machdep.c,v 1.24 2020/09/05 16:30:10 riastradh Exp $");
#define ELFSIZE 64
@@ -55,8 +55,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_exec_m
#include <machine/vmparam.h>
#include <sys/syscallargs.h>
-#include <uvm/uvm.h>
-
#include <compat/linux/common/linux_types.h>
#include <compat/linux/common/linux_signal.h>
#include <compat/linux/common/linux_machdep.h>
Index: src/sys/compat/linux/arch/i386/linux_exec_machdep.c
diff -u src/sys/compat/linux/arch/i386/linux_exec_machdep.c:1.19 src/sys/compat/linux/arch/i386/linux_exec_machdep.c:1.20
--- src/sys/compat/linux/arch/i386/linux_exec_machdep.c:1.19 Sun Jul 19 13:55:08 2020
+++ src/sys/compat/linux/arch/i386/linux_exec_machdep.c Sat Sep 5 16:30:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_exec_machdep.c,v 1.19 2020/07/19 13:55:08 maxv Exp $ */
+/* $NetBSD: linux_exec_machdep.c,v 1.20 2020/09/05 16:30:10 riastradh Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_exec_machdep.c,v 1.19 2020/07/19 13:55:08 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_exec_machdep.c,v 1.20 2020/09/05 16:30:10 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,8 +45,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_exec_m
#include <sys/cpu.h>
#include <machine/vmparam.h>
-#include <uvm/uvm.h>
-
#include <sys/syscallargs.h>
#ifndef DEBUG_LINUX
Index: src/sys/compat/netbsd32/netbsd32_kern_proc.c
diff -u src/sys/compat/netbsd32/netbsd32_kern_proc.c:1.5 src/sys/compat/netbsd32/netbsd32_kern_proc.c:1.6
--- src/sys/compat/netbsd32/netbsd32_kern_proc.c:1.5 Thu Dec 12 02:15:42 2019
+++ src/sys/compat/netbsd32/netbsd32_kern_proc.c Sat Sep 5 16:30:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_kern_proc.c,v 1.5 2019/12/12 02:15:42 pgoyette Exp $ */
+/* $NetBSD: netbsd32_kern_proc.c,v 1.6 2020/09/05 16:30:10 riastradh Exp $ */
/*-
* Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_kern_proc.c,v 1.5 2019/12/12 02:15:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_kern_proc.c,v 1.6 2020/09/05 16:30:10 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_kstack.h"
@@ -102,9 +102,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_ker
#include <sys/cpu.h>
#include <sys/compat_stub.h>
-#include <uvm/uvm_extern.h>
-#include <uvm/uvm.h>
-
#include <compat/netbsd32/netbsd32.h>
#include <compat/netbsd32/netbsd32_kern_proc.h>
Index: src/sys/dev/kloader.c
diff -u src/sys/dev/kloader.c:1.27 src/sys/dev/kloader.c:1.28
--- src/sys/dev/kloader.c:1.27 Thu Jun 11 08:14:38 2015
+++ src/sys/dev/kloader.c Sat Sep 5 16:30:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kloader.c,v 1.27 2015/06/11 08:14:38 matt Exp $ */
+/* $NetBSD: kloader.c,v 1.28 2020/09/05 16:30:11 riastradh Exp $ */
/*-
* Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kloader.c,v 1.27 2015/06/11 08:14:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kloader.c,v 1.28 2020/09/05 16:30:11 riastradh Exp $");
#include "debug_kloader.h"
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: kloader.c,v
#define ELFSIZE 32
#include <sys/exec_elf.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
#include <machine/kloader.h>
Index: src/sys/dev/bus_dma/bus_dmamem_common.c
diff -u src/sys/dev/bus_dma/bus_dmamem_common.c:1.2 src/sys/dev/bus_dma/bus_dmamem_common.c:1.3
--- src/sys/dev/bus_dma/bus_dmamem_common.c:1.2 Tue Oct 2 23:49:19 2012
+++ src/sys/dev/bus_dma/bus_dmamem_common.c Sat Sep 5 16:30:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dmamem_common.c,v 1.2 2012/10/02 23:49:19 christos Exp $ */
+/* $NetBSD: bus_dmamem_common.c,v 1.3 2020/09/05 16:30:10 riastradh Exp $ */
/*-
* Copyright (c) 1997, 1998, 2009 The NetBSD Foundation, Inc.
@@ -32,14 +32,14 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: bus_dmamem_common.c,v 1.2 2012/10/02 23:49:19 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dmamem_common.c,v 1.3 2020/09/05 16:30:10 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
#include <sys/bus.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
#include <dev/bus_dma/bus_dmamem_common.h>
Index: src/sys/dev/ic/ssdfb.c
diff -u src/sys/dev/ic/ssdfb.c:1.11 src/sys/dev/ic/ssdfb.c:1.12
--- src/sys/dev/ic/ssdfb.c:1.11 Sun Feb 23 15:46:39 2020
+++ src/sys/dev/ic/ssdfb.c Sat Sep 5 16:30:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ssdfb.c,v 1.11 2020/02/23 15:46:39 ad Exp $ */
+/* $NetBSD: ssdfb.c,v 1.12 2020/09/05 16:30:11 riastradh Exp $ */
/*
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -30,19 +30,20 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ssdfb.c,v 1.11 2020/02/23 15:46:39 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ssdfb.c,v 1.12 2020/09/05 16:30:11 riastradh Exp $");
#include "opt_ddb.h"
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/conf.h>
-#include <uvm/uvm.h>
-#include <uvm/uvm_page.h>
-#include <uvm/uvm_device.h>
#include <sys/condvar.h>
#include <sys/kmem.h>
#include <sys/kthread.h>
+
+#include <uvm/uvm_device.h>
+#include <uvm/uvm_extern.h>
+
#include <dev/wscons/wsdisplayvar.h>
#include <dev/rasops/rasops.h>
#include <dev/ic/ssdfbvar.h>
Index: src/sys/dev/ic/sti.c
diff -u src/sys/dev/ic/sti.c:1.21 src/sys/dev/ic/sti.c:1.22
--- src/sys/dev/ic/sti.c:1.21 Mon May 4 06:52:53 2020
+++ src/sys/dev/ic/sti.c Sat Sep 5 16:30:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sti.c,v 1.21 2020/05/04 06:52:53 tsutsui Exp $ */
+/* $NetBSD: sti.c,v 1.22 2020/09/05 16:30:11 riastradh Exp $ */
/* $OpenBSD: sti.c,v 1.61 2009/09/05 14:09:35 miod Exp $ */
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.21 2020/05/04 06:52:53 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.22 2020/09/05 16:30:11 riastradh Exp $");
#include "wsdisplay.h"
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.21
#include <sys/device.h>
#include <sys/malloc.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
#include <sys/bus.h>
Index: src/sys/dev/marvell/if_gfe.c
diff -u src/sys/dev/marvell/if_gfe.c:1.56 src/sys/dev/marvell/if_gfe.c:1.57
--- src/sys/dev/marvell/if_gfe.c:1.56 Wed Feb 5 08:34:48 2020
+++ src/sys/dev/marvell/if_gfe.c Sat Sep 5 16:30:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gfe.c,v 1.56 2020/02/05 08:34:48 skrll Exp $ */
+/* $NetBSD: if_gfe.c,v 1.57 2020/09/05 16:30:11 riastradh Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.56 2020/02/05 08:34:48 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.57 2020/09/05 16:30:11 riastradh Exp $");
#include "opt_inet.h"
@@ -56,7 +56,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1
#include <sys/mutex.h>
#include <sys/socket.h>
-#include <uvm/uvm.h>
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_ether.h>
Index: src/sys/dev/nvmm/nvmm.c
diff -u src/sys/dev/nvmm/nvmm.c:1.39 src/sys/dev/nvmm/nvmm.c:1.40
--- src/sys/dev/nvmm/nvmm.c:1.39 Sat Sep 5 07:22:25 2020
+++ src/sys/dev/nvmm/nvmm.c Sat Sep 5 16:30:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm.c,v 1.39 2020/09/05 07:22:25 maxv Exp $ */
+/* $NetBSD: nvmm.c,v 1.40 2020/09/05 16:30:11 riastradh Exp $ */
/*
* Copyright (c) 2018-2020 Maxime Villard, m00nbsd.net
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm.c,v 1.39 2020/09/05 07:22:25 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm.c,v 1.40 2020/09/05 16:30:11 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,7 +46,8 @@ __KERNEL_RCSID(0, "$NetBSD: nvmm.c,v 1.3
#include <sys/filedesc.h>
#include <sys/device.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_aobj.h>
+#include <uvm/uvm_extern.h>
#include <uvm/uvm_page.h>
#include "ioconf.h"
Index: src/sys/dev/nvmm/x86/nvmm_x86.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86.c:1.18 src/sys/dev/nvmm/x86/nvmm_x86.c:1.19
--- src/sys/dev/nvmm/x86/nvmm_x86.c:1.18 Sat Sep 5 07:45:44 2020
+++ src/sys/dev/nvmm/x86/nvmm_x86.c Sat Sep 5 16:30:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86.c,v 1.18 2020/09/05 07:45:44 maxv Exp $ */
+/* $NetBSD: nvmm_x86.c,v 1.19 2020/09/05 16:30:11 riastradh Exp $ */
/*
* Copyright (c) 2018-2020 Maxime Villard, m00nbsd.net
@@ -29,16 +29,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86.c,v 1.18 2020/09/05 07:45:44 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86.c,v 1.19 2020/09/05 16:30:11 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/cpu.h>
-#include <uvm/uvm.h>
-#include <uvm/uvm_page.h>
-
#include <x86/cputypes.h>
#include <x86/specialreg.h>
#include <x86/pmap.h>
Index: src/sys/dev/nvmm/x86/nvmm_x86_svm.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.77 src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.78
--- src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.77 Sat Sep 5 07:26:38 2020
+++ src/sys/dev/nvmm/x86/nvmm_x86_svm.c Sat Sep 5 16:30:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86_svm.c,v 1.77 2020/09/05 07:26:38 maxv Exp $ */
+/* $NetBSD: nvmm_x86_svm.c,v 1.78 2020/09/05 16:30:11 riastradh Exp $ */
/*
* Copyright (c) 2018-2020 Maxime Villard, m00nbsd.net
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.77 2020/09/05 07:26:38 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.78 2020/09/05 16:30:11 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,8 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm
#include <sys/xcall.h>
#include <sys/mman.h>
-#include <uvm/uvm.h>
-#include <uvm/uvm_page.h>
+#include <uvm/uvm_extern.h>
#include <x86/cputypes.h>
#include <x86/specialreg.h>
Index: src/sys/dev/nvmm/x86/nvmm_x86_vmx.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.76 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.77
--- src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.76 Sat Sep 5 07:22:26 2020
+++ src/sys/dev/nvmm/x86/nvmm_x86_vmx.c Sat Sep 5 16:30:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86_vmx.c,v 1.76 2020/09/05 07:22:26 maxv Exp $ */
+/* $NetBSD: nvmm_x86_vmx.c,v 1.77 2020/09/05 16:30:11 riastradh Exp $ */
/*
* Copyright (c) 2018-2020 Maxime Villard, m00nbsd.net
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.76 2020/09/05 07:22:26 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.77 2020/09/05 16:30:11 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,8 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx
#include <sys/mman.h>
#include <sys/bitops.h>
-#include <uvm/uvm.h>
-#include <uvm/uvm_page.h>
+#include <uvm/uvm_extern.h>
#include <x86/cputypes.h>
#include <x86/specialreg.h>
Index: src/sys/dev/sbus/genfb_sbus.c
diff -u src/sys/dev/sbus/genfb_sbus.c:1.11 src/sys/dev/sbus/genfb_sbus.c:1.12
--- src/sys/dev/sbus/genfb_sbus.c:1.11 Thu Jul 24 21:35:13 2014
+++ src/sys/dev/sbus/genfb_sbus.c Sat Sep 5 16:30:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb_sbus.c,v 1.11 2014/07/24 21:35:13 riastradh Exp $ */
+/* $NetBSD: genfb_sbus.c,v 1.12 2020/09/05 16:30:11 riastradh Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -29,7 +29,7 @@
/* an SBus frontend for the generic fb console driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb_sbus.c,v 1.11 2014/07/24 21:35:13 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb_sbus.c,v 1.12 2020/09/05 16:30:11 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -38,8 +38,6 @@ __KERNEL_RCSID(0, "$NetBSD: genfb_sbus.c
#include <sys/ioctl.h>
#include <sys/conf.h>
-#include <uvm/uvm.h>
-
#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/pmap.h>
Index: src/sys/dev/usb/udl.c
diff -u src/sys/dev/usb/udl.c:1.24 src/sys/dev/usb/udl.c:1.25
--- src/sys/dev/usb/udl.c:1.24 Fri Dec 27 09:41:51 2019
+++ src/sys/dev/usb/udl.c Sat Sep 5 16:30:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: udl.c,v 1.24 2019/12/27 09:41:51 msaitoh Exp $ */
+/* $NetBSD: udl.c,v 1.25 2020/09/05 16:30:11 riastradh Exp $ */
/*-
* Copyright (c) 2009 FUKAUMI Naoki.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udl.c,v 1.24 2019/12/27 09:41:51 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udl.c,v 1.25 2020/09/05 16:30:11 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -67,11 +67,12 @@ __KERNEL_RCSID(0, "$NetBSD: udl.c,v 1.24
#include <sys/kmem.h>
#include <sys/kthread.h>
#include <sys/condvar.h>
-#include <uvm/uvm.h>
#include <sys/bus.h>
#include <sys/endian.h>
+#include <uvm/uvm_extern.h>
+
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdivar.h>
Index: src/sys/external/bsd/sljit/dist/sljit_src/sljitExecAllocator.c
diff -u src/sys/external/bsd/sljit/dist/sljit_src/sljitExecAllocator.c:1.6 src/sys/external/bsd/sljit/dist/sljit_src/sljitExecAllocator.c:1.7
--- src/sys/external/bsd/sljit/dist/sljit_src/sljitExecAllocator.c:1.6 Sun Jan 20 23:14:16 2019
+++ src/sys/external/bsd/sljit/dist/sljit_src/sljitExecAllocator.c Sat Sep 5 16:30:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sljitExecAllocator.c,v 1.6 2019/01/20 23:14:16 alnsn Exp $ */
+/* $NetBSD: sljitExecAllocator.c,v 1.7 2020/09/05 16:30:11 riastradh Exp $ */
/*
* Stack-less Just-In-Time compiler
@@ -99,7 +99,7 @@ static SLJIT_INLINE void free_chunk(void
#ifdef _KERNEL
#include <sys/param.h>
#include <sys/module.h> /* for module_map */
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
#else
#include <sys/mman.h>
#endif
Index: src/sys/external/bsd/sljit/dist/sljit_src/sljitUtils.c
diff -u src/sys/external/bsd/sljit/dist/sljit_src/sljitUtils.c:1.10 src/sys/external/bsd/sljit/dist/sljit_src/sljitUtils.c:1.11
--- src/sys/external/bsd/sljit/dist/sljit_src/sljitUtils.c:1.10 Sun Jan 20 23:14:16 2019
+++ src/sys/external/bsd/sljit/dist/sljit_src/sljitUtils.c Sat Sep 5 16:30:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sljitUtils.c,v 1.10 2019/01/20 23:14:16 alnsn Exp $ */
+/* $NetBSD: sljitUtils.c,v 1.11 2020/09/05 16:30:11 riastradh Exp $ */
/*
* Stack-less Just-In-Time compiler
@@ -192,7 +192,7 @@ SLJIT_API_FUNC_ATTRIBUTE void SLJIT_CALL
#ifdef _KERNEL
#include <sys/param.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
#elif defined(_WIN32)
#include "windows.h"
#else
Index: src/sys/fs/tmpfs/tmpfs_subr.c
diff -u src/sys/fs/tmpfs/tmpfs_subr.c:1.112 src/sys/fs/tmpfs/tmpfs_subr.c:1.113
--- src/sys/fs/tmpfs/tmpfs_subr.c:1.112 Sun May 17 19:39:15 2020
+++ src/sys/fs/tmpfs/tmpfs_subr.c Sat Sep 5 16:30:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs_subr.c,v 1.112 2020/05/17 19:39:15 ad Exp $ */
+/* $NetBSD: tmpfs_subr.c,v 1.113 2020/09/05 16:30:12 riastradh Exp $ */
/*
* Copyright (c) 2005-2020 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_subr.c,v 1.112 2020/05/17 19:39:15 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_subr.c,v 1.113 2020/09/05 16:30:12 riastradh Exp $");
#include <sys/param.h>
#include <sys/cprng.h>
@@ -89,7 +89,9 @@ __KERNEL_RCSID(0, "$NetBSD: tmpfs_subr.c
#include <sys/kauth.h>
#include <sys/atomic.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_aobj.h>
+#include <uvm/uvm_extern.h>
+#include <uvm/uvm_object.h>
#include <miscfs/specfs/specdev.h>
#include <miscfs/genfs/genfs.h>
Index: src/sys/fs/tmpfs/tmpfs_vnops.c
diff -u src/sys/fs/tmpfs/tmpfs_vnops.c:1.143 src/sys/fs/tmpfs/tmpfs_vnops.c:1.144
--- src/sys/fs/tmpfs/tmpfs_vnops.c:1.143 Sat Jun 27 17:29:18 2020
+++ src/sys/fs/tmpfs/tmpfs_vnops.c Sat Sep 5 16:30:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs_vnops.c,v 1.143 2020/06/27 17:29:18 christos Exp $ */
+/* $NetBSD: tmpfs_vnops.c,v 1.144 2020/09/05 16:30:12 riastradh Exp $ */
/*
* Copyright (c) 2005, 2006, 2007, 2020 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.143 2020/06/27 17:29:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.144 2020/09/05 16:30:12 riastradh Exp $");
#include <sys/param.h>
#include <sys/dirent.h>
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.
#include <sys/kauth.h>
#include <sys/atomic.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_object.h>
#include <miscfs/fifofs/fifo.h>
#include <miscfs/genfs/genfs.h>
Index: src/sys/kern/kern_idle.c
diff -u src/sys/kern/kern_idle.c:1.33 src/sys/kern/kern_idle.c:1.34
--- src/sys/kern/kern_idle.c:1.33 Thu Mar 26 19:42:39 2020
+++ src/sys/kern/kern_idle.c Sat Sep 5 16:30:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_idle.c,v 1.33 2020/03/26 19:42:39 ad Exp $ */
+/* $NetBSD: kern_idle.c,v 1.34 2020/09/05 16:30:12 riastradh Exp $ */
/*-
* Copyright (c)2002, 2006, 2007 YAMAMOTO Takashi,
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_idle.c,v 1.33 2020/03/26 19:42:39 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_idle.c,v 1.34 2020/09/05 16:30:12 riastradh Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -40,7 +40,6 @@ __KERNEL_RCSID(0, "$NetBSD: kern_idle.c,
#include <sys/atomic.h>
#include <uvm/uvm.h> /* uvm_idle */
-#include <uvm/uvm_extern.h>
void
idle_loop(void *dummy)
Index: src/sys/kern/kern_proc.c
diff -u src/sys/kern/kern_proc.c:1.259 src/sys/kern/kern_proc.c:1.260
--- src/sys/kern/kern_proc.c:1.259 Fri Aug 28 22:27:51 2020
+++ src/sys/kern/kern_proc.c Sat Sep 5 16:30:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_proc.c,v 1.259 2020/08/28 22:27:51 riastradh Exp $ */
+/* $NetBSD: kern_proc.c,v 1.260 2020/09/05 16:30:12 riastradh Exp $ */
/*-
* Copyright (c) 1999, 2006, 2007, 2008, 2020 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.259 2020/08/28 22:27:51 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.260 2020/09/05 16:30:12 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_kstack.h"
@@ -110,7 +110,6 @@ __KERNEL_RCSID(0, "$NetBSD: kern_proc.c,
#include <sys/pserialize.h>
#include <uvm/uvm_extern.h>
-#include <uvm/uvm.h>
/*
* Process lists.
Index: src/sys/kern/subr_asan.c
diff -u src/sys/kern/subr_asan.c:1.24 src/sys/kern/subr_asan.c:1.25
--- src/sys/kern/subr_asan.c:1.24 Fri Jul 10 07:48:27 2020
+++ src/sys/kern/subr_asan.c Sat Sep 5 16:30:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_asan.c,v 1.24 2020/07/10 07:48:27 skrll Exp $ */
+/* $NetBSD: subr_asan.c,v 1.25 2020/09/05 16:30:12 riastradh Exp $ */
/*
* Copyright (c) 2018-2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_asan.c,v 1.24 2020/07/10 07:48:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_asan.c,v 1.25 2020/09/05 16:30:12 riastradh Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: subr_asan.c,
#include <sys/types.h>
#include <sys/asan.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
#ifdef KASAN_PANIC
#define REPORT panic
Index: src/sys/kern/subr_msan.c
diff -u src/sys/kern/subr_msan.c:1.12 src/sys/kern/subr_msan.c:1.13
--- src/sys/kern/subr_msan.c:1.12 Tue Jun 30 16:20:02 2020
+++ src/sys/kern/subr_msan.c Sat Sep 5 16:30:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_msan.c,v 1.12 2020/06/30 16:20:02 maxv Exp $ */
+/* $NetBSD: subr_msan.c,v 1.13 2020/09/05 16:30:12 riastradh Exp $ */
/*
* Copyright (c) 2019-2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_msan.c,v 1.12 2020/06/30 16:20:02 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_msan.c,v 1.13 2020/09/05 16:30:12 riastradh Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -46,8 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: subr_msan.c,
#include <sys/cpu.h>
#include <sys/msan.h>
-#include <uvm/uvm.h>
-
static void kmsan_printf(const char *, ...);
void kmsan_init_arg(size_t);
Index: src/sys/miscfs/genfs/genfs_vnops.c
diff -u src/sys/miscfs/genfs/genfs_vnops.c:1.209 src/sys/miscfs/genfs/genfs_vnops.c:1.210
--- src/sys/miscfs/genfs/genfs_vnops.c:1.209 Fri Aug 7 18:14:21 2020
+++ src/sys/miscfs/genfs/genfs_vnops.c Sat Sep 5 16:30:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_vnops.c,v 1.209 2020/08/07 18:14:21 christos Exp $ */
+/* $NetBSD: genfs_vnops.c,v 1.210 2020/09/05 16:30:12 riastradh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfs_vnops.c,v 1.209 2020/08/07 18:14:21 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_vnops.c,v 1.210 2020/09/05 16:30:12 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -80,9 +80,6 @@ __KERNEL_RCSID(0, "$NetBSD: genfs_vnops.
#include <miscfs/genfs/genfs_node.h>
#include <miscfs/specfs/specdev.h>
-#include <uvm/uvm.h>
-#include <uvm/uvm_pager.h>
-
static void filt_genfsdetach(struct knote *);
static int filt_genfsread(struct knote *, long);
static int filt_genfsvnode(struct knote *, long);
Index: src/sys/miscfs/procfs/procfs_linux.c
diff -u src/sys/miscfs/procfs/procfs_linux.c:1.86 src/sys/miscfs/procfs/procfs_linux.c:1.87
--- src/sys/miscfs/procfs/procfs_linux.c:1.86 Thu Jun 11 22:21:05 2020
+++ src/sys/miscfs/procfs/procfs_linux.c Sat Sep 5 16:30:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_linux.c,v 1.86 2020/06/11 22:21:05 ad Exp $ */
+/* $NetBSD: procfs_linux.c,v 1.87 2020/09/05 16:30:12 riastradh Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_linux.c,v 1.86 2020/06/11 22:21:05 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_linux.c,v 1.87 2020/09/05 16:30:12 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -64,8 +64,8 @@ __KERNEL_RCSID(0, "$NetBSD: procfs_linux
#include <compat/linux/common/linux_exec.h>
#include <compat/linux32/common/linux32_sysctl.h>
-#include <uvm/uvm_extern.h>
#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
extern struct devsw_conv *devsw_conv;
extern int max_devsw_convs;
Index: src/sys/modules/examples/mapper/mapper.c
diff -u src/sys/modules/examples/mapper/mapper.c:1.2 src/sys/modules/examples/mapper/mapper.c:1.3
--- src/sys/modules/examples/mapper/mapper.c:1.2 Thu Jan 30 07:58:33 2020
+++ src/sys/modules/examples/mapper/mapper.c Sat Sep 5 16:30:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mapper.c,v 1.2 2020/01/30 07:58:33 kamil Exp $ */
+/* $NetBSD: mapper.c,v 1.3 2020/09/05 16:30:12 riastradh Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mapper.c,v 1.2 2020/01/30 07:58:33 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mapper.c,v 1.3 2020/09/05 16:30:12 riastradh Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -37,8 +37,6 @@ __KERNEL_RCSID(0, "$NetBSD: mapper.c,v 1
#include <sys/module.h>
#include <sys/systm.h>
-#include <uvm/uvm.h>
-
/*
* Creating a device /dev/mapper for demonstration.
* To use this device you need to do:
Index: src/sys/nfs/nfs_bio.c
diff -u src/sys/nfs/nfs_bio.c:1.198 src/sys/nfs/nfs_bio.c:1.199
--- src/sys/nfs/nfs_bio.c:1.198 Sat May 23 23:42:44 2020
+++ src/sys/nfs/nfs_bio.c Sat Sep 5 16:30:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_bio.c,v 1.198 2020/05/23 23:42:44 ad Exp $ */
+/* $NetBSD: nfs_bio.c,v 1.199 2020/09/05 16:30:12 riastradh Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_bio.c,v 1.198 2020/05/23 23:42:44 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_bio.c,v 1.199 2020/09/05 16:30:12 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_nfs.h"
@@ -55,8 +55,8 @@ __KERNEL_RCSID(0, "$NetBSD: nfs_bio.c,v
#include <sys/dirent.h>
#include <sys/kauth.h>
-#include <uvm/uvm_extern.h>
#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
#include <nfs/rpcv2.h>
#include <nfs/nfsproto.h>
Index: src/sys/nfs/nfs_kq.c
diff -u src/sys/nfs/nfs_kq.c:1.26 src/sys/nfs/nfs_kq.c:1.27
--- src/sys/nfs/nfs_kq.c:1.26 Wed Oct 25 08:12:40 2017
+++ src/sys/nfs/nfs_kq.c Sat Sep 5 16:30:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_kq.c,v 1.26 2017/10/25 08:12:40 maya Exp $ */
+/* $NetBSD: nfs_kq.c,v 1.27 2020/09/05 16:30:12 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_kq.c,v 1.26 2017/10/25 08:12:40 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_kq.c,v 1.27 2020/09/05 16:30:12 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,9 +45,6 @@ __KERNEL_RCSID(0, "$NetBSD: nfs_kq.c,v 1
#include <sys/file.h>
#include <sys/kthread.h>
-#include <uvm/uvm_extern.h>
-#include <uvm/uvm.h>
-
#include <nfs/rpcv2.h>
#include <nfs/nfsproto.h>
#include <nfs/nfs.h>
Index: src/sys/nfs/nfs_serv.c
diff -u src/sys/nfs/nfs_serv.c:1.180 src/sys/nfs/nfs_serv.c:1.181
--- src/sys/nfs/nfs_serv.c:1.180 Sat Apr 4 07:07:20 2020
+++ src/sys/nfs/nfs_serv.c Sat Sep 5 16:30:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_serv.c,v 1.180 2020/04/04 07:07:20 mlelstv Exp $ */
+/* $NetBSD: nfs_serv.c,v 1.181 2020/09/05 16:30:12 riastradh Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.180 2020/04/04 07:07:20 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.181 2020/09/05 16:30:12 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -78,7 +78,9 @@ __KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v
#include <sys/syscallargs.h>
#include <sys/syscallvar.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
+#include <uvm/uvm_loan.h>
+#include <uvm/uvm_page.h>
#include <nfs/nfsproto.h>
#include <nfs/rpcv2.h>
Index: src/sys/nfs/nfs_subs.c
diff -u src/sys/nfs/nfs_subs.c:1.240 src/sys/nfs/nfs_subs.c:1.241
--- src/sys/nfs/nfs_subs.c:1.240 Mon May 25 21:15:10 2020
+++ src/sys/nfs/nfs_subs.c Sat Sep 5 16:30:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_subs.c,v 1.240 2020/05/25 21:15:10 ad Exp $ */
+/* $NetBSD: nfs_subs.c,v 1.241 2020/09/05 16:30:12 riastradh Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_subs.c,v 1.240 2020/05/25 21:15:10 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_subs.c,v 1.241 2020/09/05 16:30:12 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_nfs.h"
@@ -100,7 +100,7 @@ __KERNEL_RCSID(0, "$NetBSD: nfs_subs.c,v
#include <sys/atomic.h>
#include <sys/cprng.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_page.h>
#include <uvm/uvm_page_array.h>
#include <nfs/rpcv2.h>
Index: src/sys/nfs/nfs_vnops.c
diff -u src/sys/nfs/nfs_vnops.c:1.316 src/sys/nfs/nfs_vnops.c:1.317
--- src/sys/nfs/nfs_vnops.c:1.316 Sat Jun 27 17:29:19 2020
+++ src/sys/nfs/nfs_vnops.c Sat Sep 5 16:30:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_vnops.c,v 1.316 2020/06/27 17:29:19 christos Exp $ */
+/* $NetBSD: nfs_vnops.c,v 1.317 2020/09/05 16:30:12 riastradh Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.316 2020/06/27 17:29:19 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.317 2020/09/05 16:30:12 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_nfs.h"
@@ -70,8 +70,11 @@ __KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,
#include <sys/kauth.h>
#include <sys/cprng.h>
-#include <uvm/uvm_extern.h>
+#ifdef UVMHIST
#include <uvm/uvm.h>
+#endif
+#include <uvm/uvm_extern.h>
+#include <uvm/uvm_stat.h>
#include <miscfs/fifofs/fifo.h>
#include <miscfs/genfs/genfs.h>
Index: src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c
diff -u src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c:1.8 src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c:1.9
--- src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c:1.8 Sun Jan 27 02:08:48 2019
+++ src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c Sat Sep 5 16:30:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpdev_bus_dma.c,v 1.8 2019/01/27 02:08:48 pgoyette Exp $ */
+/* $NetBSD: rumpdev_bus_dma.c,v 1.9 2020/09/05 16:30:12 riastradh Exp $ */
/*-
* Copyright (c) 2013 Antti Kantee
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpdev_bus_dma.c,v 1.8 2019/01/27 02:08:48 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpdev_bus_dma.c,v 1.9 2020/09/05 16:30:12 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -80,8 +80,6 @@ __KERNEL_RCSID(0, "$NetBSD: rumpdev_bus_
#include <sys/bus.h>
#include <sys/intr.h>
-#include <uvm/uvm.h>
-
#include "pci_user.h"
#define EIEIO membar_sync()
Index: src/sys/ufs/chfs/chfs_pool.c
diff -u src/sys/ufs/chfs/chfs_pool.c:1.4 src/sys/ufs/chfs/chfs_pool.c:1.5
--- src/sys/ufs/chfs/chfs_pool.c:1.4 Mon Jun 17 17:14:56 2019
+++ src/sys/ufs/chfs/chfs_pool.c Sat Sep 5 16:30:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_pool.c,v 1.4 2019/06/17 17:14:56 ryoon Exp $ */
+/* $NetBSD: chfs_pool.c,v 1.5 2020/09/05 16:30:12 riastradh Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -40,8 +40,6 @@
#include <sys/pool.h>
#include <sys/atomic.h>
-#include <uvm/uvm.h>
-
#include "chfs.h"
/* --------------------------------------------------------------------- */
Index: src/sys/ufs/chfs/chfs_subr.c
diff -u src/sys/ufs/chfs/chfs_subr.c:1.14 src/sys/ufs/chfs/chfs_subr.c:1.15
--- src/sys/ufs/chfs/chfs_subr.c:1.14 Thu Jun 11 19:20:47 2020
+++ src/sys/ufs/chfs/chfs_subr.c Sat Sep 5 16:30:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_subr.c,v 1.14 2020/06/11 19:20:47 ad Exp $ */
+/* $NetBSD: chfs_subr.c,v 1.15 2020/09/05 16:30:12 riastradh Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -49,7 +49,7 @@
#include <sys/proc.h>
#include <sys/atomic.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
#include <miscfs/specfs/specdev.h>
#include <miscfs/genfs/genfs.h>
Index: src/sys/ufs/chfs/chfs_vfsops.c
diff -u src/sys/ufs/chfs/chfs_vfsops.c:1.21 src/sys/ufs/chfs/chfs_vfsops.c:1.22
--- src/sys/ufs/chfs/chfs_vfsops.c:1.21 Fri Jan 17 20:08:10 2020
+++ src/sys/ufs/chfs/chfs_vfsops.c Sat Sep 5 16:30:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_vfsops.c,v 1.21 2020/01/17 20:08:10 ad Exp $ */
+/* $NetBSD: chfs_vfsops.c,v 1.22 2020/09/05 16:30:12 riastradh Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -52,8 +52,8 @@
#include <sys/lockdebug.h>
#include <sys/ktrace.h>
-#include <uvm/uvm.h>
-#include <uvm/uvm_pager.h>
+#include <uvm/uvm_extern.h>
+
#include <ufs/ufs/dir.h>
#include <ufs/ufs/ufs_extern.h>
#include <miscfs/genfs/genfs.h>
Index: src/sys/ufs/chfs/chfs_vnops.c
diff -u src/sys/ufs/chfs/chfs_vnops.c:1.41 src/sys/ufs/chfs/chfs_vnops.c:1.42
--- src/sys/ufs/chfs/chfs_vnops.c:1.41 Sat May 23 23:42:44 2020
+++ src/sys/ufs/chfs/chfs_vnops.c Sat Sep 5 16:30:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_vnops.c,v 1.41 2020/05/23 23:42:44 ad Exp $ */
+/* $NetBSD: chfs_vnops.c,v 1.42 2020/09/05 16:30:12 riastradh Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -38,7 +38,7 @@
#include <miscfs/genfs/genfs.h>
#include <ufs/ufs/dir.h>
#include <ufs/ufs/ufs_extern.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
#include <sys/namei.h>
#include <sys/stat.h>
#include <sys/fcntl.h>
Index: src/sys/ufs/ext2fs/ext2fs_balloc.c
diff -u src/sys/ufs/ext2fs/ext2fs_balloc.c:1.42 src/sys/ufs/ext2fs/ext2fs_balloc.c:1.43
--- src/sys/ufs/ext2fs/ext2fs_balloc.c:1.42 Mon Sep 3 16:29:37 2018
+++ src/sys/ufs/ext2fs/ext2fs_balloc.c Sat Sep 5 16:30:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_balloc.c,v 1.42 2018/09/03 16:29:37 riastradh Exp $ */
+/* $NetBSD: ext2fs_balloc.c,v 1.43 2020/09/05 16:30:13 riastradh Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_balloc.c,v 1.42 2018/09/03 16:29:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_balloc.c,v 1.43 2020/09/05 16:30:13 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_uvmhist.h"
@@ -75,7 +75,10 @@ __KERNEL_RCSID(0, "$NetBSD: ext2fs_ballo
#include <sys/mount.h>
#include <sys/kauth.h>
+#ifdef UVMHIST
#include <uvm/uvm.h>
+#endif
+#include <uvm/uvm_stat.h>
#include <ufs/ufs/inode.h>
#include <ufs/ufs/ufs_extern.h>
Index: src/sys/ufs/ffs/ffs_alloc.c
diff -u src/sys/ufs/ffs/ffs_alloc.c:1.168 src/sys/ufs/ffs/ffs_alloc.c:1.169
--- src/sys/ufs/ffs/ffs_alloc.c:1.168 Sun Jul 26 00:20:13 2020
+++ src/sys/ufs/ffs/ffs_alloc.c Sat Sep 5 16:30:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_alloc.c,v 1.168 2020/07/26 00:20:13 chs Exp $ */
+/* $NetBSD: ffs_alloc.c,v 1.169 2020/09/05 16:30:13 riastradh Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_alloc.c,v 1.168 2020/07/26 00:20:13 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_alloc.c,v 1.169 2020/09/05 16:30:13 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -103,7 +103,8 @@ __KERNEL_RCSID(0, "$NetBSD: ffs_alloc.c,
#include <ufs/ffs/ffs_extern.h>
#ifdef UVM_PAGE_TRKOWN
-#include <uvm/uvm.h>
+#include <uvm/uvm_object.h>
+#include <uvm/uvm_page.h>
#endif
static daddr_t ffs_alloccg(struct inode *, int, daddr_t, int, int, int);
Index: src/sys/ufs/ffs/ffs_balloc.c
diff -u src/sys/ufs/ffs/ffs_balloc.c:1.64 src/sys/ufs/ffs/ffs_balloc.c:1.65
--- src/sys/ufs/ffs/ffs_balloc.c:1.64 Sat Apr 18 19:18:34 2020
+++ src/sys/ufs/ffs/ffs_balloc.c Sat Sep 5 16:30:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_balloc.c,v 1.64 2020/04/18 19:18:34 christos Exp $ */
+/* $NetBSD: ffs_balloc.c,v 1.65 2020/09/05 16:30:13 riastradh Exp $ */
/*
* Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -41,10 +41,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_balloc.c,v 1.64 2020/04/18 19:18:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_balloc.c,v 1.65 2020/09/05 16:30:13 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_quota.h"
+#include "opt_uvmhist.h"
#endif
#include <sys/param.h>
@@ -65,7 +66,11 @@ __KERNEL_RCSID(0, "$NetBSD: ffs_balloc.c
#include <ufs/ffs/fs.h>
#include <ufs/ffs/ffs_extern.h>
+#ifdef UVMHIST
#include <uvm/uvm.h>
+#endif
+#include <uvm/uvm_extern.h>
+#include <uvm/uvm_stat.h>
static int ffs_balloc_ufs1(struct vnode *, off_t, int, kauth_cred_t, int,
struct buf **);
Index: src/sys/ufs/ffs/ffs_extattr.c
diff -u src/sys/ufs/ffs/ffs_extattr.c:1.6 src/sys/ufs/ffs/ffs_extattr.c:1.7
--- src/sys/ufs/ffs/ffs_extattr.c:1.6 Wed May 20 13:16:30 2020
+++ src/sys/ufs/ffs/ffs_extattr.c Sat Sep 5 16:30:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_extattr.c,v 1.6 2020/05/20 13:16:30 christos Exp $ */
+/* $NetBSD: ffs_extattr.c,v 1.7 2020/09/05 16:30:13 riastradh Exp $ */
/*-
* SPDX-License-Identifier: (BSD-2-Clause-FreeBSD AND BSD-3-Clause)
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_extattr.c,v 1.6 2020/05/20 13:16:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_extattr.c,v 1.7 2020/09/05 16:30:13 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -105,8 +105,6 @@ __KERNEL_RCSID(0, "$NetBSD: ffs_extattr.
#include <ufs/ffs/fs.h>
#include <ufs/ffs/ffs_extern.h>
-#include <uvm/uvm.h>
-
#define ALIGNED_TO(ptr, s) \
(((uintptr_t)(ptr) & (_Alignof(s) - 1)) == 0)
#define uoff_t uintmax_t
Index: src/sys/ufs/ffs/ffs_vnops.c
diff -u src/sys/ufs/ffs/ffs_vnops.c:1.132 src/sys/ufs/ffs/ffs_vnops.c:1.133
--- src/sys/ufs/ffs/ffs_vnops.c:1.132 Sat May 16 18:31:53 2020
+++ src/sys/ufs/ffs/ffs_vnops.c Sat Sep 5 16:30:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_vnops.c,v 1.132 2020/05/16 18:31:53 christos Exp $ */
+/* $NetBSD: ffs_vnops.c,v 1.133 2020/09/05 16:30:13 riastradh Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_vnops.c,v 1.132 2020/05/16 18:31:53 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vnops.c,v 1.133 2020/09/05 16:30:13 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -98,8 +98,6 @@ __KERNEL_RCSID(0, "$NetBSD: ffs_vnops.c,
#include <ufs/ffs/fs.h>
#include <ufs/ffs/ffs_extern.h>
-#include <uvm/uvm.h>
-
/* Global vfs data structures for ufs. */
int (**ffs_vnodeop_p)(void *);
const struct vnodeopv_entry_desc ffs_vnodeop_entries[] = {
Index: src/sys/ufs/lfs/lfs_balloc.c
diff -u src/sys/ufs/lfs/lfs_balloc.c:1.95 src/sys/ufs/lfs/lfs_balloc.c:1.96
--- src/sys/ufs/lfs/lfs_balloc.c:1.95 Sun Feb 23 08:39:48 2020
+++ src/sys/ufs/lfs/lfs_balloc.c Sat Sep 5 16:30:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_balloc.c,v 1.95 2020/02/23 08:39:48 riastradh Exp $ */
+/* $NetBSD: lfs_balloc.c,v 1.96 2020/09/05 16:30:13 riastradh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_balloc.c,v 1.95 2020/02/23 08:39:48 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_balloc.c,v 1.96 2020/09/05 16:30:13 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_quota.h"
@@ -89,7 +89,7 @@ __KERNEL_RCSID(0, "$NetBSD: lfs_balloc.c
#include <ufs/lfs/lfs_extern.h>
#include <ufs/lfs/lfs_kernel.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
static int lfs_fragextend(struct vnode *, int, int, daddr_t, struct buf **,
kauth_cred_t);
Index: src/sys/ufs/lfs/lfs_bio.c
diff -u src/sys/ufs/lfs/lfs_bio.c:1.148 src/sys/ufs/lfs/lfs_bio.c:1.149
--- src/sys/ufs/lfs/lfs_bio.c:1.148 Thu Jun 11 19:20:47 2020
+++ src/sys/ufs/lfs/lfs_bio.c Sat Sep 5 16:30:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_bio.c,v 1.148 2020/06/11 19:20:47 ad Exp $ */
+/* $NetBSD: lfs_bio.c,v 1.149 2020/09/05 16:30:13 riastradh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2008 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v 1.148 2020/06/11 19:20:47 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v 1.149 2020/09/05 16:30:13 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -81,7 +81,7 @@ __KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v
#include <ufs/lfs/lfs_extern.h>
#include <ufs/lfs/lfs_kernel.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
/*
* LFS block write function.
Index: src/sys/ufs/lfs/lfs_pages.c
diff -u src/sys/ufs/lfs/lfs_pages.c:1.25 src/sys/ufs/lfs/lfs_pages.c:1.26
--- src/sys/ufs/lfs/lfs_pages.c:1.25 Tue Mar 17 18:31:38 2020
+++ src/sys/ufs/lfs/lfs_pages.c Sat Sep 5 16:30:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_pages.c,v 1.25 2020/03/17 18:31:38 ad Exp $ */
+/* $NetBSD: lfs_pages.c,v 1.26 2020/09/05 16:30:13 riastradh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2019 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_pages.c,v 1.25 2020/03/17 18:31:38 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_pages.c,v 1.26 2020/09/05 16:30:13 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -94,9 +94,10 @@ __KERNEL_RCSID(0, "$NetBSD: lfs_pages.c,
#include <ufs/lfs/ulfs_extern.h>
#include <uvm/uvm.h>
+#include <uvm/uvm_page.h>
+#include <uvm/uvm_pager.h>
#include <uvm/uvm_pmap.h>
#include <uvm/uvm_stat.h>
-#include <uvm/uvm_pager.h>
#include <ufs/lfs/lfs.h>
#include <ufs/lfs/lfs_accessors.h>
Index: src/sys/ufs/lfs/ulfs_inode.c
diff -u src/sys/ufs/lfs/ulfs_inode.c:1.25 src/sys/ufs/lfs/ulfs_inode.c:1.26
--- src/sys/ufs/lfs/ulfs_inode.c:1.25 Sun Feb 23 15:46:42 2020
+++ src/sys/ufs/lfs/ulfs_inode.c Sat Sep 5 16:30:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_inode.c,v 1.25 2020/02/23 15:46:42 ad Exp $ */
+/* $NetBSD: ulfs_inode.c,v 1.26 2020/09/05 16:30:13 riastradh Exp $ */
/* from NetBSD: ufs_inode.c,v 1.95 2015/06/13 14:56:45 hannken Exp */
/*
@@ -38,11 +38,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_inode.c,v 1.25 2020/02/23 15:46:42 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_inode.c,v 1.26 2020/09/05 16:30:13 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_lfs.h"
#include "opt_quota.h"
+#include "opt_uvmhist.h"
#endif
#include <sys/param.h>
@@ -69,7 +70,11 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_inode.c
#include <ufs/lfs/ulfs_extattr.h>
#endif
+#ifdef UVMHIST
#include <uvm/uvm.h>
+#endif
+#include <uvm/uvm_page.h>
+#include <uvm/uvm_stat.h>
/*
* Last reference to an inode. If necessary, write or delete it.
Index: src/sys/ufs/lfs/lfs_rename.c
diff -u src/sys/ufs/lfs/lfs_rename.c:1.23 src/sys/ufs/lfs/lfs_rename.c:1.24
--- src/sys/ufs/lfs/lfs_rename.c:1.23 Sun Feb 23 08:41:07 2020
+++ src/sys/ufs/lfs/lfs_rename.c Sat Sep 5 16:30:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_rename.c,v 1.23 2020/02/23 08:41:07 riastradh Exp $ */
+/* $NetBSD: lfs_rename.c,v 1.24 2020/09/05 16:30:13 riastradh Exp $ */
/* from NetBSD: ufs_rename.c,v 1.12 2015/03/27 17:27:56 riastradh Exp */
/*-
@@ -89,7 +89,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_rename.c,v 1.23 2020/02/23 08:41:07 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_rename.c,v 1.24 2020/09/05 16:30:13 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -109,11 +109,6 @@ __KERNEL_RCSID(0, "$NetBSD: lfs_rename.c
#include <sys/kauth.h>
#include <sys/syslog.h>
-#include <uvm/uvm.h>
-#include <uvm/uvm_pmap.h>
-#include <uvm/uvm_stat.h>
-#include <uvm/uvm_pager.h>
-
#include <miscfs/fifofs/fifo.h>
#include <miscfs/genfs/genfs.h>
#include <miscfs/specfs/specdev.h>
Index: src/sys/ufs/lfs/lfs_rfw.c
diff -u src/sys/ufs/lfs/lfs_rfw.c:1.35 src/sys/ufs/lfs/lfs_rfw.c:1.36
--- src/sys/ufs/lfs/lfs_rfw.c:1.35 Fri Jan 17 20:08:10 2020
+++ src/sys/ufs/lfs/lfs_rfw.c Sat Sep 5 16:30:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_rfw.c,v 1.35 2020/01/17 20:08:10 ad Exp $ */
+/* $NetBSD: lfs_rfw.c,v 1.36 2020/09/05 16:30:13 riastradh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_rfw.c,v 1.35 2020/01/17 20:08:10 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_rfw.c,v 1.36 2020/09/05 16:30:13 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_quota.h"
@@ -54,7 +54,6 @@ __KERNEL_RCSID(0, "$NetBSD: lfs_rfw.c,v
#include <sys/pool.h>
#include <sys/socket.h>
#include <sys/syslog.h>
-#include <uvm/uvm_extern.h>
#include <sys/sysctl.h>
#include <sys/conf.h>
#include <sys/kauth.h>
@@ -66,10 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: lfs_rfw.c,v
#include <ufs/lfs/ulfsmount.h>
#include <ufs/lfs/ulfs_extern.h>
-#include <uvm/uvm.h>
-#include <uvm/uvm_stat.h>
-#include <uvm/uvm_pager.h>
-#include <uvm/uvm_pdaemon.h>
+#include <uvm/uvm_extern.h>
#include <ufs/lfs/lfs.h>
#include <ufs/lfs/lfs_accessors.h>
Index: src/sys/ufs/lfs/lfs_segment.c
diff -u src/sys/ufs/lfs/lfs_segment.c:1.287 src/sys/ufs/lfs/lfs_segment.c:1.288
--- src/sys/ufs/lfs/lfs_segment.c:1.287 Thu Aug 13 17:26:43 2020
+++ src/sys/ufs/lfs/lfs_segment.c Sat Sep 5 16:30:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_segment.c,v 1.287 2020/08/13 17:26:43 riastradh Exp $ */
+/* $NetBSD: lfs_segment.c,v 1.288 2020/09/05 16:30:13 riastradh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.287 2020/08/13 17:26:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.288 2020/09/05 16:30:13 riastradh Exp $");
#ifdef DEBUG
# define vndebug(vp, str) do { \
@@ -104,8 +104,8 @@ __KERNEL_RCSID(0, "$NetBSD: lfs_segment.
#include <ufs/lfs/lfs_kernel.h>
#include <ufs/lfs/lfs_extern.h>
-#include <uvm/uvm.h>
#include <uvm/uvm_extern.h>
+#include <uvm/uvm_page.h>
MALLOC_JUSTDEFINE(M_SEGMENT, "LFS segment", "Segment for LFS");
Index: src/sys/ufs/lfs/lfs_subr.c
diff -u src/sys/ufs/lfs/lfs_subr.c:1.102 src/sys/ufs/lfs/lfs_subr.c:1.103
--- src/sys/ufs/lfs/lfs_subr.c:1.102 Sun Feb 23 15:23:08 2020
+++ src/sys/ufs/lfs/lfs_subr.c Sat Sep 5 16:30:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_subr.c,v 1.102 2020/02/23 15:23:08 riastradh Exp $ */
+/* $NetBSD: lfs_subr.c,v 1.103 2020/09/05 16:30:13 riastradh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_subr.c,v 1.102 2020/02/23 15:23:08 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_subr.c,v 1.103 2020/09/05 16:30:13 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -78,8 +78,6 @@ __KERNEL_RCSID(0, "$NetBSD: lfs_subr.c,v
#include <ufs/lfs/lfs_kernel.h>
#include <ufs/lfs/lfs_extern.h>
-#include <uvm/uvm.h>
-
#ifdef DEBUG
const char *lfs_res_names[LFS_NB_COUNT] = {
"summary",
Index: src/sys/ufs/lfs/lfs_vfsops.c
diff -u src/sys/ufs/lfs/lfs_vfsops.c:1.379 src/sys/ufs/lfs/lfs_vfsops.c:1.380
--- src/sys/ufs/lfs/lfs_vfsops.c:1.379 Tue Aug 4 03:00:47 2020
+++ src/sys/ufs/lfs/lfs_vfsops.c Sat Sep 5 16:30:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vfsops.c,v 1.379 2020/08/04 03:00:47 riastradh Exp $ */
+/* $NetBSD: lfs_vfsops.c,v 1.380 2020/09/05 16:30:13 riastradh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007, 2007
@@ -61,11 +61,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.379 2020/08/04 03:00:47 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.380 2020/09/05 16:30:13 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_lfs.h"
#include "opt_quota.h"
+#include "opt_uvmhist.h"
#endif
#include <sys/param.h>
@@ -86,7 +87,6 @@ __KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c
#include <sys/pool.h>
#include <sys/socket.h>
#include <sys/syslog.h>
-#include <uvm/uvm_extern.h>
#include <sys/sysctl.h>
#include <sys/conf.h>
#include <sys/kauth.h>
@@ -103,10 +103,13 @@ __KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c
#include <ufs/lfs/ulfs_bswap.h>
#include <ufs/lfs/ulfs_extern.h>
+#ifdef UVMHIST
#include <uvm/uvm.h>
+#endif
+#include <uvm/uvm_extern.h>
+#include <uvm/uvm_object.h>
+#include <uvm/uvm_page.h>
#include <uvm/uvm_stat.h>
-#include <uvm/uvm_pager.h>
-#include <uvm/uvm_pdaemon.h>
#include <ufs/lfs/lfs.h>
#include <ufs/lfs/lfs_accessors.h>
Index: src/sys/ufs/lfs/lfs_vnops.c
diff -u src/sys/ufs/lfs/lfs_vnops.c:1.335 src/sys/ufs/lfs/lfs_vnops.c:1.336
--- src/sys/ufs/lfs/lfs_vnops.c:1.335 Sat Sep 5 02:55:38 2020
+++ src/sys/ufs/lfs/lfs_vnops.c Sat Sep 5 16:30:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vnops.c,v 1.335 2020/09/05 02:55:38 riastradh Exp $ */
+/* $NetBSD: lfs_vnops.c,v 1.336 2020/09/05 16:30:13 riastradh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -125,7 +125,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.335 2020/09/05 02:55:38 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.336 2020/09/05 16:30:13 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -157,10 +157,7 @@ __KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,
#include <ufs/lfs/ulfs_bswap.h>
#include <ufs/lfs/ulfs_extern.h>
-#include <uvm/uvm.h>
-#include <uvm/uvm_pmap.h>
-#include <uvm/uvm_stat.h>
-#include <uvm/uvm_pager.h>
+#include <uvm/uvm_extern.h>
#include <ufs/lfs/lfs.h>
#include <ufs/lfs/lfs_accessors.h>
Index: src/sys/ufs/lfs/ulfs_snapshot.c
diff -u src/sys/ufs/lfs/ulfs_snapshot.c:1.3 src/sys/ufs/lfs/ulfs_snapshot.c:1.4
--- src/sys/ufs/lfs/ulfs_snapshot.c:1.3 Sat Nov 14 22:03:54 2015
+++ src/sys/ufs/lfs/ulfs_snapshot.c Sat Sep 5 16:30:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_snapshot.c,v 1.3 2015/11/14 22:03:54 pgoyette Exp $ */
+/* $NetBSD: ulfs_snapshot.c,v 1.4 2020/09/05 16:30:13 riastradh Exp $ */
/* from ffs_snapshot.c,v 1.122 2013/05/07 09:40:54 hannken Exp */
/*
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_snapshot.c,v 1.3 2015/11/14 22:03:54 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_snapshot.c,v 1.4 2020/09/05 16:30:13 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_lfs.h"
@@ -73,8 +73,6 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_snapsho
#include <ufs/lfs/lfs.h>
#include <ufs/lfs/lfs_extern.h>
-#include <uvm/uvm.h>
-
/*
* Decrement extra reference on snapshot when last name is removed.
* It will not be freed until the last open reference goes away.
Index: src/sys/ufs/lfs/ulfs_vnops.c
diff -u src/sys/ufs/lfs/ulfs_vnops.c:1.53 src/sys/ufs/lfs/ulfs_vnops.c:1.54
--- src/sys/ufs/lfs/ulfs_vnops.c:1.53 Sat May 16 18:31:53 2020
+++ src/sys/ufs/lfs/ulfs_vnops.c Sat Sep 5 16:30:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_vnops.c,v 1.53 2020/05/16 18:31:53 christos Exp $ */
+/* $NetBSD: ulfs_vnops.c,v 1.54 2020/09/05 16:30:13 riastradh Exp $ */
/* from NetBSD: ufs_vnops.c,v 1.232 2016/05/19 18:32:03 riastradh Exp */
/*-
@@ -67,11 +67,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c,v 1.53 2020/05/16 18:31:53 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c,v 1.54 2020/09/05 16:30:13 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_lfs.h"
#include "opt_quota.h"
+#include "opt_uvmhist.h"
#endif
#include <sys/param.h>
@@ -107,7 +108,10 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c
#include <ufs/lfs/ulfs_dirhash.h>
#endif
+#ifdef UVMHIST
#include <uvm/uvm.h>
+#endif
+#include <uvm/uvm_stat.h>
static int ulfs_chmod(struct vnode *, int, kauth_cred_t, struct lwp *);
static int ulfs_chown(struct vnode *, uid_t, gid_t, kauth_cred_t,
Index: src/sys/ufs/ufs/ufs_inode.c
diff -u src/sys/ufs/ufs/ufs_inode.c:1.111 src/sys/ufs/ufs/ufs_inode.c:1.112
--- src/sys/ufs/ufs/ufs_inode.c:1.111 Sun Jul 26 00:21:24 2020
+++ src/sys/ufs/ufs/ufs_inode.c Sat Sep 5 16:30:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_inode.c,v 1.111 2020/07/26 00:21:24 chs Exp $ */
+/* $NetBSD: ufs_inode.c,v 1.112 2020/09/05 16:30:13 riastradh Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -37,12 +37,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_inode.c,v 1.111 2020/07/26 00:21:24 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_inode.c,v 1.112 2020/09/05 16:30:13 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
#include "opt_quota.h"
#include "opt_wapbl.h"
+#include "opt_uvmhist.h"
#endif
#include <sys/param.h>
@@ -67,7 +68,11 @@ __KERNEL_RCSID(0, "$NetBSD: ufs_inode.c,
#include <ufs/ufs/extattr.h>
#endif
+#ifdef UVMHIST
#include <uvm/uvm.h>
+#endif
+#include <uvm/uvm_page.h>
+#include <uvm/uvm_stat.h>
/*
* Last reference to an inode. If necessary, write or delete it.
Index: src/sys/ufs/ufs/ufs_vnops.c
diff -u src/sys/ufs/ufs/ufs_vnops.c:1.258 src/sys/ufs/ufs/ufs_vnops.c:1.259
--- src/sys/ufs/ufs/ufs_vnops.c:1.258 Sat Sep 5 02:55:39 2020
+++ src/sys/ufs/ufs/ufs_vnops.c Sat Sep 5 16:30:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_vnops.c,v 1.258 2020/09/05 02:55:39 riastradh Exp $ */
+/* $NetBSD: ufs_vnops.c,v 1.259 2020/09/05 16:30:13 riastradh Exp $ */
/*-
* Copyright (c) 2008, 2020 The NetBSD Foundation, Inc.
@@ -66,11 +66,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_vnops.c,v 1.258 2020/09/05 02:55:39 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_vnops.c,v 1.259 2020/09/05 16:30:13 riastradh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
#include "opt_quota.h"
+#include "opt_uvmhist.h"
#endif
#include <sys/param.h>
@@ -112,7 +113,11 @@ __KERNEL_RCSID(0, "$NetBSD: ufs_vnops.c,
#include <ufs/lfs/lfs_extern.h>
#include <ufs/lfs/lfs.h>
+#ifdef UVMHIST
#include <uvm/uvm.h>
+#endif
+#include <uvm/uvm_extern.h>
+#include <uvm/uvm_stat.h>
__CTASSERT(EXT2FS_MAXNAMLEN == FFS_MAXNAMLEN);
__CTASSERT(LFS_MAXNAMLEN == FFS_MAXNAMLEN);
Index: src/sys/uvm/uvm_device.h
diff -u src/sys/uvm/uvm_device.h:1.13 src/sys/uvm/uvm_device.h:1.14
--- src/sys/uvm/uvm_device.h:1.13 Sun Dec 14 23:48:58 2014
+++ src/sys/uvm/uvm_device.h Sat Sep 5 16:30:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_device.h,v 1.13 2014/12/14 23:48:58 chs Exp $ */
+/* $NetBSD: uvm_device.h,v 1.14 2020/09/05 16:30:13 riastradh Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -36,6 +36,12 @@
* device handle into the VM system.
*/
+#include <sys/types.h>
+
+#include <sys/queue.h>
+
+#include <uvm/uvm_object.h>
+
/*
* the uvm_device structure. object is put at the top of the data structure.
* this allows:
@@ -58,6 +64,9 @@ struct uvm_device {
#ifdef _KERNEL
+#include <uvm/uvm_param.h>
+#include <uvm/uvm_prot.h>
+
/*
* prototypes
*/
Index: src/sys/uvm/uvm_pdaemon.h
diff -u src/sys/uvm/uvm_pdaemon.h:1.19 src/sys/uvm/uvm_pdaemon.h:1.20
--- src/sys/uvm/uvm_pdaemon.h:1.19 Sun Feb 23 15:46:43 2020
+++ src/sys/uvm/uvm_pdaemon.h Sat Sep 5 16:30:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pdaemon.h,v 1.19 2020/02/23 15:46:43 ad Exp $ */
+/* $NetBSD: uvm_pdaemon.h,v 1.20 2020/09/05 16:30:13 riastradh Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -70,6 +70,15 @@
#ifdef _KERNEL
+#ifdef _KERNEL_OPT
+#include "opt_vmswap.h"
+#endif
+
+#include <sys/stdbool.h>
+
+struct vm_page;
+struct krwlock;
+
/*
* prototypes
*/
@@ -77,7 +86,7 @@
void uvm_wait(const char *);
bool uvm_reclaimable(void);
-krwlock_t *uvmpd_trylockowner(struct vm_page *);
+struct krwlock *uvmpd_trylockowner(struct vm_page *);
#ifdef VMSWAP
bool uvmpd_dropswap(struct vm_page *);
#else
Index: src/sys/uvm/uvm_swap.h
diff -u src/sys/uvm/uvm_swap.h:1.25 src/sys/uvm/uvm_swap.h:1.26
--- src/sys/uvm/uvm_swap.h:1.25 Wed May 1 07:17:18 2019
+++ src/sys/uvm/uvm_swap.h Sat Sep 5 16:30:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_swap.h,v 1.25 2019/05/01 07:17:18 mlelstv Exp $ */
+/* $NetBSD: uvm_swap.h,v 1.26 2020/09/05 16:30:13 riastradh Exp $ */
/*
* Copyright (c) 1997 Matthew R. Green
@@ -43,6 +43,7 @@ struct lwp;
#if defined(VMSWAP)
struct swapent;
+struct vm_page;
int uvm_swap_get(struct vm_page *, int, int);
int uvm_swap_put(int, struct vm_page **, int, int);
