diff options
| author | rwatson <rwatson@FreeBSD.org> | 2015-03-19 13:37:36 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2015-03-19 13:37:36 +0000 |
| commit | 6102a34d3875e6b3f22e0245d7698fe549c674a1 (patch) | |
| tree | df3b1e38c02357cff6357a78741ce42d4959b672 /sys/fs | |
| parent | 24836ef695b4d0b47117fe6ed0d34b16e37a68aa (diff) | |
| download | FreeBSD-src-6102a34d3875e6b3f22e0245d7698fe549c674a1.zip FreeBSD-src-6102a34d3875e6b3f22e0245d7698fe549c674a1.tar.gz | |
Merge r263233 from HEAD to stable/10:
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.
Sponsored by: Google, Inc.
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 1ed531b..9c98832 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 2ae9933..c00a96c 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 b198d59..a217828 100644 --- a/sys/fs/nfsclient/nfs_clport.c +++ b/sys/fs/nfsclient/nfs_clport.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include "opt_inet6.h" #include "opt_kdtrace.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 c24cfe0..c94d425 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 |
