diff options
| author | rwatson <rwatson@FreeBSD.org> | 2014-03-16 10:55:57 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2014-03-16 10:55:57 +0000 |
| commit | 33fdc14c0cd663baae9fad419e3f9cfe12578196 (patch) | |
| tree | 33c10255950e4922f9ee4bc63543bd5dd3cd9f77 /sys/fs | |
| parent | d2c1f34d5670ac7d1891f1f3c06cfaeee010b843 (diff) | |
| download | FreeBSD-src-33fdc14c0cd663baae9fad419e3f9cfe12578196.zip FreeBSD-src-33fdc14c0cd663baae9fad419e3f9cfe12578196.tar.gz | |
Update kernel inclusions of capability.h to use capsicum.h instead; some
further refinement is required as some device drivers intended to be
portable over FreeBSD versions rely on __FreeBSD_version to decide whether
to include capability.h.
MFC after: 3 weeks
Diffstat (limited to 'sys/fs')
| -rw-r--r-- | sys/fs/fdescfs/fdesc_vnops.c | 2 | ||||
| -rw-r--r-- | sys/fs/fuse/fuse_vfsops.c | 2 | ||||
| -rw-r--r-- | sys/fs/nfsclient/nfs_clport.c | 2 | ||||
| -rw-r--r-- | sys/fs/nfsserver/nfs_nfsdport.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index b976504..a263225 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -40,7 +40,7 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/conf.h> #include <sys/dirent.h> #include <sys/filedesc.h> diff --git a/sys/fs/fuse/fuse_vfsops.c b/sys/fs/fuse/fuse_vfsops.c index 0b4f19b..7388745 100644 --- a/sys/fs/fuse/fuse_vfsops.c +++ b/sys/fs/fuse/fuse_vfsops.c @@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$"); #include <sys/errno.h> #include <sys/param.h> #include <sys/kernel.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/conf.h> #include <sys/filedesc.h> #include <sys/uio.h> diff --git a/sys/fs/nfsclient/nfs_clport.c b/sys/fs/nfsclient/nfs_clport.c index 0b85353..8529c76 100644 --- a/sys/fs/nfsclient/nfs_clport.c +++ b/sys/fs/nfsclient/nfs_clport.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include "opt_inet6.h" -#include <sys/capability.h> +#include <sys/capsicum.h> /* * generally, I don't like #includes inside .h files, but it seems to diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index 21d302f..e36843c 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -34,7 +34,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/capability.h> +#include <sys/capsicum.h> /* * Functions that perform the vfs operations required by the routines in |
