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/compat | |
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/compat')
-rw-r--r-- | sys/compat/freebsd32/freebsd32_capability.c | 2 | ||||
-rw-r--r-- | sys/compat/freebsd32/freebsd32_ioctl.c | 2 | ||||
-rw-r--r-- | sys/compat/freebsd32/freebsd32_misc.c | 2 | ||||
-rw-r--r-- | sys/compat/linux/linux_file.c | 2 | ||||
-rw-r--r-- | sys/compat/linux/linux_ioctl.c | 2 | ||||
-rw-r--r-- | sys/compat/linux/linux_socket.c | 2 | ||||
-rw-r--r-- | sys/compat/svr4/svr4_fcntl.c | 2 | ||||
-rw-r--r-- | sys/compat/svr4/svr4_filio.c | 2 | ||||
-rw-r--r-- | sys/compat/svr4/svr4_ioctl.c | 2 | ||||
-rw-r--r-- | sys/compat/svr4/svr4_misc.c | 2 | ||||
-rw-r--r-- | sys/compat/svr4/svr4_stream.c | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/sys/compat/freebsd32/freebsd32_capability.c b/sys/compat/freebsd32/freebsd32_capability.c index 27c83c4..2aee10b 100644 --- a/sys/compat/freebsd32/freebsd32_capability.c +++ b/sys/compat/freebsd32/freebsd32_capability.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #include "opt_capsicum.h" #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/filedesc.h> #include <sys/malloc.h> #include <sys/proc.h> diff --git a/sys/compat/freebsd32/freebsd32_ioctl.c b/sys/compat/freebsd32/freebsd32_ioctl.c index 1f90e58..39380a2 100644 --- a/sys/compat/freebsd32/freebsd32_ioctl.c +++ b/sys/compat/freebsd32/freebsd32_ioctl.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/cdio.h> #include <sys/fcntl.h> #include <sys/filio.h> diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 749c91d..e7cbb65 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/bus.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/clock.h> #include <sys/exec.h> #include <sys/fcntl.h> diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index a6b1d35..e56e61f 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #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/fcntl.h> diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 48afc09..166ffce 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/sysproto.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/cdio.h> #include <sys/dvdio.h> #include <sys/conf.h> diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 7a8ed68..43b255d 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <sys/proc.h> #include <sys/systm.h> #include <sys/sysproto.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/fcntl.h> #include <sys/file.h> #include <sys/limits.h> diff --git a/sys/compat/svr4/svr4_fcntl.c b/sys/compat/svr4/svr4_fcntl.c index 8d0b715..c604675 100644 --- a/sys/compat/svr4/svr4_fcntl.c +++ b/sys/compat/svr4/svr4_fcntl.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/systm.h> #include <sys/file.h> #include <sys/filedesc.h> diff --git a/sys/compat/svr4/svr4_filio.c b/sys/compat/svr4/svr4_filio.c index b953e72..c92fd98 100644 --- a/sys/compat/svr4/svr4_filio.c +++ b/sys/compat/svr4/svr4_filio.c @@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/proc.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/file.h> #include <sys/filio.h> #include <sys/lock.h> diff --git a/sys/compat/svr4/svr4_ioctl.c b/sys/compat/svr4/svr4_ioctl.c index a8c8c8c..7cc01cc 100644 --- a/sys/compat/svr4/svr4_ioctl.c +++ b/sys/compat/svr4/svr4_ioctl.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/proc.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/file.h> #include <sys/filedesc.h> #include <sys/fcntl.h> diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c index 4888698..4005ce4 100644 --- a/sys/compat/svr4/svr4_misc.c +++ b/sys/compat/svr4/svr4_misc.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/dirent.h> #include <sys/fcntl.h> #include <sys/filedesc.h> diff --git a/sys/compat/svr4/svr4_stream.c b/sys/compat/svr4/svr4_stream.c index 6348b9b..91c393f 100644 --- a/sys/compat/svr4/svr4_stream.c +++ b/sys/compat/svr4/svr4_stream.c @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/fcntl.h> #include <sys/filedesc.h> #include <sys/filio.h> |