From owner-svn-src-all@FreeBSD.ORG  Wed Jun 17 15:01:01 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 79DD11065686;
	Wed, 17 Jun 2009 15:01:01 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 676A98FC12;
	Wed, 17 Jun 2009 15:01:01 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5HF11Wm079238;
	Wed, 17 Jun 2009 15:01:01 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5HF114t079229;
	Wed, 17 Jun 2009 15:01:01 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200906171501.n5HF114t079229@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Wed, 17 Jun 2009 15:01:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194368 - in head/sys: compat/linux fs/nfsclient kern
	net netinet netinet6 sys
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Jun 2009 15:01:01 -0000

Author: bz
Date: Wed Jun 17 15:01:01 2009
New Revision: 194368
URL: http://svn.freebsd.org/changeset/base/194368

Log:
  Add explicit includes for jail.h to the files that need them and
  remove the "hidden" one from vimage.h.

Modified:
  head/sys/compat/linux/linux_ioctl.c
  head/sys/fs/nfsclient/nfs_clvnops.c
  head/sys/kern/kern_sysctl.c
  head/sys/net/bpf.c
  head/sys/net/if_tun.c
  head/sys/netinet/tcp_subr.c
  head/sys/netinet6/in6_proto.c
  head/sys/sys/vimage.h

Modified: head/sys/compat/linux/linux_ioctl.c
==============================================================================
--- head/sys/compat/linux/linux_ioctl.c	Wed Jun 17 14:50:41 2009	(r194367)
+++ head/sys/compat/linux/linux_ioctl.c	Wed Jun 17 15:01:01 2009	(r194368)
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/filio.h>
+#include <sys/jail.h>
 #include <sys/kbio.h>
 #include <sys/kernel.h>
 #include <sys/linker_set.h>

Modified: head/sys/fs/nfsclient/nfs_clvnops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clvnops.c	Wed Jun 17 14:50:41 2009	(r194367)
+++ head/sys/fs/nfsclient/nfs_clvnops.c	Wed Jun 17 15:01:01 2009	(r194368)
@@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/mount.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
+#include <sys/jail.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/namei.h>

Modified: head/sys/kern/kern_sysctl.c
==============================================================================
--- head/sys/kern/kern_sysctl.c	Wed Jun 17 14:50:41 2009	(r194367)
+++ head/sys/kern/kern_sysctl.c	Wed Jun 17 15:01:01 2009	(r194368)
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/priv.h>
 #include <sys/proc.h>
+#include <sys/jail.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sx.h>

Modified: head/sys/net/bpf.c
==============================================================================
--- head/sys/net/bpf.c	Wed Jun 17 14:50:41 2009	(r194367)
+++ head/sys/net/bpf.c	Wed Jun 17 15:01:01 2009	(r194368)
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
+#include <sys/jail.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/time.h>

Modified: head/sys/net/if_tun.c
==============================================================================
--- head/sys/net/if_tun.c	Wed Jun 17 14:50:41 2009	(r194367)
+++ head/sys/net/if_tun.c	Wed Jun 17 15:01:01 2009	(r194368)
@@ -25,6 +25,7 @@
 #include <sys/priv.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
+#include <sys/jail.h>
 #include <sys/mbuf.h>
 #include <sys/module.h>
 #include <sys/socket.h>

Modified: head/sys/netinet/tcp_subr.c
==============================================================================
--- head/sys/netinet/tcp_subr.c	Wed Jun 17 14:50:41 2009	(r194367)
+++ head/sys/netinet/tcp_subr.c	Wed Jun 17 15:01:01 2009	(r194368)
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/callout.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
+#include <sys/jail.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #ifdef INET6

Modified: head/sys/netinet6/in6_proto.c
==============================================================================
--- head/sys/netinet6/in6_proto.c	Wed Jun 17 14:50:41 2009	(r194367)
+++ head/sys/netinet6/in6_proto.c	Wed Jun 17 15:01:01 2009	(r194368)
@@ -76,6 +76,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socketvar.h>
 #include <sys/proc.h>
 #include <sys/protosw.h>
+#include <sys/jail.h>
 #include <sys/kernel.h>
 #include <sys/domain.h>
 #include <sys/mbuf.h>

Modified: head/sys/sys/vimage.h
==============================================================================
--- head/sys/sys/vimage.h	Wed Jun 17 14:50:41 2009	(r194367)
+++ head/sys/sys/vimage.h	Wed Jun 17 15:01:01 2009	(r194368)
@@ -35,9 +35,6 @@
 
 #include <sys/proc.h>
 #include <sys/queue.h>
-#ifdef VIMAGE
-#include <sys/jail.h>
-#endif
 
 /* Interim userspace API. */
 struct vi_req {