From cac2fe116fb1431e5d9f22d2c536ee13c925eaa8 Mon Sep 17 00:00:00 2001
From: kib <kib@FreeBSD.org>
Date: Sun, 5 Aug 2012 14:11:42 +0000
Subject: [PATCH] After the PHYS_TO_VM_PAGE() function was de-inlined, the main
 reason to pull vm_param.h was removed.  Other big dependency of vm_page.h on
 vm_param.h are PA_LOCK* definitions, which are only needed for in-kernel
 code, because modules use KBI-safe functions to lock the pages.

Stop including vm_param.h into vm_page.h. Include vm_param.h
explicitely for the kernel code which needs it.

Suggested and reviewed by:	alc
MFC after:    2 weeks
---
 sys/arm/arm/pmap.c           | 2 +-
 sys/dev/agp/agp.c            | 1 +
 sys/dev/agp/agp_i810.c       | 1 +
 sys/dev/md/md.c              | 3 +--
 sys/fs/nfsclient/nfs_clbio.c | 1 +
 sys/fs/nwfs/nwfs_io.c        | 1 +
 sys/fs/smbfs/smbfs_io.c      | 1 +
 sys/fs/tmpfs/tmpfs_subr.c    | 1 +
 sys/fs/tmpfs/tmpfs_vnops.c   | 1 +
 sys/ia64/ia64/pmap.c         | 1 +
 sys/kern/kern_proc.c         | 1 +
 sys/kern/subr_uio.c          | 2 +-
 sys/kern/uipc_syscalls.c     | 1 +
 sys/net/bpf_zerocopy.c       | 1 +
 sys/nfsclient/nfs_bio.c      | 1 +
 sys/ofed/include/linux/gfp.h | 1 +
 sys/ufs/ffs/ffs_vnops.c      | 1 +
 sys/vm/device_pager.c        | 1 +
 sys/vm/sg_pager.c            | 1 +
 sys/vm/vm_page.h             | 2 --
 sys/vm/vnode_pager.c         | 1 +
 21 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/sys/arm/arm/pmap.c b/sys/arm/arm/pmap.c
index 6a7ebfd0feba..2502e8646ec8 100644
--- a/sys/arm/arm/pmap.c
+++ b/sys/arm/arm/pmap.c
@@ -154,6 +154,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sched.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
 #include <vm/uma.h>
 #include <vm/pmap.h>
 #include <vm/vm_kern.h>
@@ -165,7 +166,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <machine/md_var.h>
-#include <machine/vmparam.h>
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/pcb.h>
diff --git a/sys/dev/agp/agp.c b/sys/dev/agp/agp.c
index 95642acd6c03..58931ad91df8 100644
--- a/sys/dev/agp/agp.c
+++ b/sys/dev/agp/agp.c
@@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/pci/pcireg.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pageout.h>
diff --git a/sys/dev/agp/agp_i810.c b/sys/dev/agp/agp_i810.c
index c0f592ce97fb..39d6cba8a557 100644
--- a/sys/dev/agp/agp_i810.c
+++ b/sys/dev/agp/agp_i810.c
@@ -67,6 +67,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/pci/pci_private.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pageout.h>
diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c
index a02f42c8112f..07c3ed641ac4 100644
--- a/sys/dev/md/md.c
+++ b/sys/dev/md/md.c
@@ -84,14 +84,13 @@
 #include <geom/geom.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pager.h>
 #include <vm/swap_pager.h>
 #include <vm/uma.h>
 
-#include <machine/vmparam.h>
-
 #define MD_MODVER 1
 
 #define MD_SHUTDOWN	0x10000		/* Tell worker thread to terminate. */
diff --git a/sys/fs/nfsclient/nfs_clbio.c b/sys/fs/nfsclient/nfs_clbio.c
index d71aeeaadb68..6583b9b5661f 100644
--- a/sys/fs/nfsclient/nfs_clbio.c
+++ b/sys/fs/nfsclient/nfs_clbio.c
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/vnode.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_page.h>
 #include <vm/vm_object.h>
diff --git a/sys/fs/nwfs/nwfs_io.c b/sys/fs/nwfs/nwfs_io.c
index 220fb9eb85c1..33f3649a2b26 100644
--- a/sys/fs/nwfs/nwfs_io.c
+++ b/sys/fs/nwfs/nwfs_io.c
@@ -38,6 +38,7 @@
 #include <sys/sysctl.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
 #include <vm/vm_page.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_object.h>
diff --git a/sys/fs/smbfs/smbfs_io.c b/sys/fs/smbfs/smbfs_io.c
index b581a98eb051..9a4610fc556a 100644
--- a/sys/fs/smbfs/smbfs_io.c
+++ b/sys/fs/smbfs/smbfs_io.c
@@ -41,6 +41,7 @@
 #include <sys/vmmeter.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
 #include <vm/vm_page.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_object.h>
diff --git a/sys/fs/tmpfs/tmpfs_subr.c b/sys/fs/tmpfs/tmpfs_subr.c
index 9395824c5bac..5f1616cf2c4e 100644
--- a/sys/fs/tmpfs/tmpfs_subr.c
+++ b/sys/fs/tmpfs/tmpfs_subr.c
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/vmmeter.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pageout.h>
diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c
index 09780c8d315a..368e1ca41331 100644
--- a/sys/fs/tmpfs/tmpfs_vnops.c
+++ b/sys/fs/tmpfs/tmpfs_vnops.c
@@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/vnode.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pager.h>
diff --git a/sys/ia64/ia64/pmap.c b/sys/ia64/ia64/pmap.c
index ff4ec531f1ec..2ad32c2edf40 100644
--- a/sys/ia64/ia64/pmap.c
+++ b/sys/ia64/ia64/pmap.c
@@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
 #include <vm/vm_object.h>
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index 9d419c7aad1b..16faff8cc4a7 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -77,6 +77,7 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
 #include <vm/vm_extern.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
diff --git a/sys/kern/subr_uio.c b/sys/kern/subr_uio.c
index b85e50b88df2..7895fcf843af 100644
--- a/sys/kern/subr_uio.c
+++ b/sys/kern/subr_uio.c
@@ -53,11 +53,11 @@ __FBSDID("$FreeBSD$");
 #include <sys/vnode.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
 #ifdef ZERO_COPY_SOCKETS
-#include <vm/vm_param.h>
 #include <vm/vm_object.h>
 #endif
 
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index 00f45e0877a8..94dd1270b00d 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -82,6 +82,7 @@ __FBSDID("$FreeBSD$");
 #include <security/mac/mac_framework.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pageout.h>
diff --git a/sys/net/bpf_zerocopy.c b/sys/net/bpf_zerocopy.c
index 1b3262906263..a8ef8d56ebd7 100644
--- a/sys/net/bpf_zerocopy.c
+++ b/sys/net/bpf_zerocopy.c
@@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
 #include <net/bpfdesc.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_map.h>
diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c
index 568f990625dc..ae3533688032 100644
--- a/sys/nfsclient/nfs_bio.c
+++ b/sys/nfsclient/nfs_bio.c
@@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/vnode.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_page.h>
 #include <vm/vm_object.h>
diff --git a/sys/ofed/include/linux/gfp.h b/sys/ofed/include/linux/gfp.h
index 661ff41ab248..8c36c15d8862 100644
--- a/sys/ofed/include/linux/gfp.h
+++ b/sys/ofed/include/linux/gfp.h
@@ -34,6 +34,7 @@
 
 #include <linux/page.h>
 
+#include <vm/vm_param.h>
 #include <vm/vm_object.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_kern.h>
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index ee6733bfd430..5c99d5bc4ce2 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -80,6 +80,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/vnode.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c
index ad3e914504ec..546c9bd807c9 100644
--- a/sys/vm/device_pager.c
+++ b/sys/vm/device_pager.c
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sx.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pager.h>
diff --git a/sys/vm/sg_pager.c b/sys/vm/sg_pager.c
index 3bee3035c2f2..c8b14bdb9561 100644
--- a/sys/vm/sg_pager.c
+++ b/sys/vm/sg_pager.c
@@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/mutex.h>
 #include <sys/sglist.h>
 #include <vm/vm.h>
+#include <vm/vm_param.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pager.h>
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
index f9d1e9702e33..14c943638f64 100644
--- a/sys/vm/vm_page.h
+++ b/sys/vm/vm_page.h
@@ -284,8 +284,6 @@ extern struct vpglocks pa_lock[];
 
 #include <sys/systm.h>
 
-#include <vm/vm_param.h>
-
 #include <machine/atomic.h>
 
 /*
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index b51a500c4aeb..da88b083a296 100644
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -68,6 +68,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/atomic.h>
 
 #include <vm/vm.h>
+#include <vm/vm_param.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pager.h>