From owner-svn-src-all@FreeBSD.ORG  Mon Aug 15 07:32:44 2011
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 73EAC106564A;
	Mon, 15 Aug 2011 07:32:44 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 634CC8FC17;
	Mon, 15 Aug 2011 07:32:44 +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 p7F7Wiid098758;
	Mon, 15 Aug 2011 07:32:44 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7F7WiBQ098755;
	Mon, 15 Aug 2011 07:32:44 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201108150732.p7F7WiBQ098755@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 15 Aug 2011 07:32:44 +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: r224876 - in head/sys: modules/portalfs ufs/ffs
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: Mon, 15 Aug 2011 07:32:44 -0000

Author: rwatson
Date: Mon Aug 15 07:32:44 2011
New Revision: 224876
URL: http://svn.freebsd.org/changeset/base/224876

Log:
  Fix two cases involving opt_capsicum.h and module builds:
  
  (1) opt_capsicum.h is no longer required in ffs_alloc.c, so remove the
     #include.
  
  (2) portalfs depends on opt_capsicum.h, so have the Makefile generate one
     if required.
  
  These affect only modules built without a kernel (i.e, not buildkernel,
  but yes buildworld if the dubious MODULES_WITH_WORLD is used).
  
  Approved by:	re (bz)
  Sponsored by:	Google Inc

Modified:
  head/sys/modules/portalfs/Makefile
  head/sys/ufs/ffs/ffs_alloc.c

Modified: head/sys/modules/portalfs/Makefile
==============================================================================
--- head/sys/modules/portalfs/Makefile	Mon Aug 15 07:30:48 2011	(r224875)
+++ head/sys/modules/portalfs/Makefile	Mon Aug 15 07:32:44 2011	(r224876)
@@ -4,6 +4,7 @@
 
 KMOD=	portalfs
 SRCS=	vnode_if.h \
-	portal_vfsops.c portal_vnops.c
+	portal_vfsops.c portal_vnops.c \
+	opt_capsicum.h
 
 .include <bsd.kmod.mk>

Modified: head/sys/ufs/ffs/ffs_alloc.c
==============================================================================
--- head/sys/ufs/ffs/ffs_alloc.c	Mon Aug 15 07:30:48 2011	(r224875)
+++ head/sys/ufs/ffs/ffs_alloc.c	Mon Aug 15 07:32:44 2011	(r224876)
@@ -62,7 +62,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_capsicum.h"
 #include "opt_quota.h"
 
 #include <sys/param.h>