svn commit: r224876 - in head/sys: modules/portalfs ufs/ffs

[Robert Watson]

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>