diff options
author | rwatson <rwatson@FreeBSD.org> | 2011-08-15 07:32:44 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2011-08-15 07:32:44 +0000 |
commit | bc78ba97c172e5075d58182001d8caeb3a3cf898 (patch) | |
tree | 8d6ce4abeb4ce812f7c73cb3a62538f76dcdee89 | |
parent | 54e2981c8a41663f9ed2b3edc7de8f52b187f55a (diff) | |
download | FreeBSD-src-bc78ba97c172e5075d58182001d8caeb3a3cf898.zip FreeBSD-src-bc78ba97c172e5075d58182001d8caeb3a3cf898.tar.gz |
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
-rw-r--r-- | sys/modules/portalfs/Makefile | 3 | ||||
-rw-r--r-- | sys/ufs/ffs/ffs_alloc.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/modules/portalfs/Makefile b/sys/modules/portalfs/Makefile index ef6955b..dcd5966 100644 --- a/sys/modules/portalfs/Makefile +++ b/sys/modules/portalfs/Makefile @@ -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> diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index 1df96a1..5f984b4 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -62,7 +62,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_capsicum.h" #include "opt_quota.h" #include <sys/param.h> |