From owner-svn-src-stable@FreeBSD.ORG  Sat Sep  8 16:40:19 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 9E9E3106568F;
	Sat,  8 Sep 2012 16:40:19 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 85D4F8FC14;
	Sat,  8 Sep 2012 16:40:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q88GeJ82021914;
	Sat, 8 Sep 2012 16:40:19 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q88GeJm1021891;
	Sat, 8 Sep 2012 16:40:19 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201209081640.q88GeJm1021891@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sat, 8 Sep 2012 16:40:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240238 - in stable/9/sys: arm/arm dev/agp dev/md
	fs/nfsclient fs/nwfs fs/smbfs fs/tmpfs ia64/ia64 kern net
	nfsclient ofed/include/linux ufs/ffs vm
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Sep 2012 16:40:19 -0000

Author: kib
Date: Sat Sep  8 16:40:18 2012
New Revision: 240238
URL: http://svn.freebsd.org/changeset/base/240238

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

Modified:
  stable/9/sys/arm/arm/pmap.c
  stable/9/sys/dev/agp/agp.c
  stable/9/sys/dev/agp/agp_i810.c
  stable/9/sys/dev/md/md.c
  stable/9/sys/fs/nfsclient/nfs_clbio.c
  stable/9/sys/fs/nwfs/nwfs_io.c
  stable/9/sys/fs/smbfs/smbfs_io.c
  stable/9/sys/fs/tmpfs/tmpfs_subr.c
  stable/9/sys/fs/tmpfs/tmpfs_vnops.c
  stable/9/sys/ia64/ia64/pmap.c
  stable/9/sys/kern/kern_proc.c
  stable/9/sys/kern/subr_uio.c
  stable/9/sys/kern/uipc_syscalls.c
  stable/9/sys/net/bpf_zerocopy.c
  stable/9/sys/nfsclient/nfs_bio.c
  stable/9/sys/ofed/include/linux/gfp.h
  stable/9/sys/ufs/ffs/ffs_vnops.c
  stable/9/sys/vm/device_pager.c
  stable/9/sys/vm/sg_pager.c
  stable/9/sys/vm/vm_page.h
  stable/9/sys/vm/vnode_pager.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)
  stable/9/sys/fs/   (props changed)

Modified: stable/9/sys/arm/arm/pmap.c
==============================================================================
--- stable/9/sys/arm/arm/pmap.c	Sat Sep  8 12:45:47 2012	(r240237)
+++ stable/9/sys/arm/arm/pmap.c	Sat Sep  8 16:40:18 2012	(r240238)
@@ -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>

Modified: stable/9/sys/dev/agp/agp.c
==============================================================================
--- stable/9/sys/dev/agp/agp.c	Sat Sep  8 12:45:47 2012	(r240237)
+++ stable/9/sys/dev/agp/agp.c	Sat Sep  8 16:40:18 2012	(r240238)
@@ -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>

Modified: stable/9/sys/dev/agp/agp_i810.c
==============================================================================
--- stable/9/sys/dev/agp/agp_i810.c	Sat Sep  8 12:45:47 2012	(r240237)
+++ stable/9/sys/dev/agp/agp_i810.c	Sat Sep  8 16:40:18 2012	(r240238)
@@ -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>

Modified: stable/9/sys/dev/md/md.c
==============================================================================
--- stable/9/sys/dev/md/md.c	Sat Sep  8 12:45:47 2012	(r240237)
+++ stable/9/sys/dev/md/md.c	Sat Sep  8 16:40:18 2012	(r240238)
@@ -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. */

Modified: stable/9/sys/fs/nfsclient/nfs_clbio.c
==============================================================================
--- stable/9/sys/fs/nfsclient/nfs_clbio.c	Sat Sep  8 12:45:47 2012	(r240237)
+++ stable/9/sys/fs/nfsclient/nfs_clbio.c	Sat Sep  8 16:40:18 2012	(r240238)
@@ -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>

Modified: stable/9/sys/fs/nwfs/nwfs_io.c
==============================================================================
--- stable/9/sys/fs/nwfs/nwfs_io.c	Sat Sep  8 12:45:47 2012	(r240237)
+++ stable/9/sys/fs/nwfs/nwfs_io.c	Sat Sep  8 16:40:18 2012	(r240238)
@@ -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>

Modified: stable/9/sys/fs/smbfs/smbfs_io.c
==============================================================================
--- stable/9/sys/fs/smbfs/smbfs_io.c	Sat Sep  8 12:45:47 2012	(r240237)
+++ stable/9/sys/fs/smbfs/smbfs_io.c	Sat Sep  8 16:40:18 2012	(r240238)
@@ -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>

Modified: stable/9/sys/fs/tmpfs/tmpfs_subr.c
==============================================================================
--- stable/9/sys/fs/tmpfs/tmpfs_subr.c	Sat Sep  8 12:45:47 2012	(r240237)
+++ stable/9/sys/fs/tmpfs/tmpfs_subr.c	Sat Sep  8 16:40:18 2012	(r240238)
@@ -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>

Modified: stable/9/sys/fs/tmpfs/tmpfs_vnops.c
==============================================================================
--- stable/9/sys/fs/tmpfs/tmpfs_vnops.c	Sat Sep  8 12:45:47 2012	(r240237)
+++ stable/9/sys/fs/tmpfs/tmpfs_vnops.c	Sat Sep  8 16:40:18 2012	(r240238)
@@ -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>

Modified: stable/9/sys/ia64/ia64/pmap.c
==============================================================================
--- stable/9/sys/ia64/ia64/pmap.c	Sat Sep  8 12:45:47 2012	(r240237)
+++ stable/9/sys/ia64/ia64/pmap.c	Sat Sep  8 16:40:18 2012	(r240238)
@@ -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>

Modified: stable/9/sys/kern/kern_proc.c
==============================================================================
--- stable/9/sys/kern/kern_proc.c	Sat Sep  8 12:45:47 2012	(r240237)
+++ stable/9/sys/kern/kern_proc.c	Sat Sep  8 16:40:18 2012	(r240238)
@@ -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>

Modified: stable/9/sys/kern/subr_uio.c
==============================================================================
--- stable/9/sys/kern/subr_uio.c	Sat Sep  8 12:45:47 2012	(r240237)
+++ stable/9/sys/kern/subr_uio.c	Sat Sep  8 16:40:18 2012	(r240238)
@@ -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
 

Modified: stable/9/sys/kern/uipc_syscalls.c
==============================================================================
--- stable/9/sys/kern/uipc_syscalls.c	Sat Sep  8 12:45:47 2012	(r240237)
+++ stable/9/sys/kern/uipc_syscalls.c	Sat Sep  8 16:40:18 2012	(r240238)
@@ -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>

Modified: stable/9/sys/net/bpf_zerocopy.c
==============================================================================
--- stable/9/sys/net/bpf_zerocopy.c	Sat Sep  8 12:45:47 2012	(r240237)
+++ stable/9/sys/net/bpf_zerocopy.c	Sat Sep  8 16:40:18 2012	(r240238)
@@ -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>

Modified: stable/9/sys/nfsclient/nfs_bio.c
==============================================================================
--- stable/9/sys/nfsclient/nfs_bio.c	Sat Sep  8 12:45:47 2012	(r240237)
+++ stable/9/sys/nfsclient/nfs_bio.c	Sat Sep  8 16:40:18 2012	(r240238)
@@ -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>

Modified: stable/9/sys/ofed/include/linux/gfp.h
==============================================================================
--- stable/9/sys/ofed/include/linux/gfp.h	Sat Sep  8 12:45:47 2012	(r240237)
+++ stable/9/sys/ofed/include/linux/gfp.h	Sat Sep  8 16:40:18 2012	(r240238)
@@ -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>

Modified: stable/9/sys/ufs/ffs/ffs_vnops.c
==============================================================================
--- stable/9/sys/ufs/ffs/ffs_vnops.c	Sat Sep  8 12:45:47 2012	(r240237)
+++ stable/9/sys/ufs/ffs/ffs_vnops.c	Sat Sep  8 16:40:18 2012	(r240238)
@@ -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>

Modified: stable/9/sys/vm/device_pager.c
==============================================================================
--- stable/9/sys/vm/device_pager.c	Sat Sep  8 12:45:47 2012	(r240237)
+++ stable/9/sys/vm/device_pager.c	Sat Sep  8 16:40:18 2012	(r240238)
@@ -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>

Modified: stable/9/sys/vm/sg_pager.c
==============================================================================
--- stable/9/sys/vm/sg_pager.c	Sat Sep  8 12:45:47 2012	(r240237)
+++ stable/9/sys/vm/sg_pager.c	Sat Sep  8 16:40:18 2012	(r240238)
@@ -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>

Modified: stable/9/sys/vm/vm_page.h
==============================================================================
--- stable/9/sys/vm/vm_page.h	Sat Sep  8 12:45:47 2012	(r240237)
+++ stable/9/sys/vm/vm_page.h	Sat Sep  8 16:40:18 2012	(r240238)
@@ -279,8 +279,6 @@ extern struct vpglocks pa_lock[];
 
 #ifdef _KERNEL
 
-#include <vm/vm_param.h>
-
 /*
  * Each pageable resident page falls into one of five lists:
  *

Modified: stable/9/sys/vm/vnode_pager.c
==============================================================================
--- stable/9/sys/vm/vnode_pager.c	Sat Sep  8 12:45:47 2012	(r240237)
+++ stable/9/sys/vm/vnode_pager.c	Sat Sep  8 16:40:18 2012	(r240238)
@@ -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>