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/i386 | |
| 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/i386')
| -rw-r--r-- | sys/i386/i386/sys_machdep.c | 2 | ||||
| -rw-r--r-- | sys/i386/ibcs2/ibcs2_fcntl.c | 2 | ||||
| -rw-r--r-- | sys/i386/ibcs2/ibcs2_ioctl.c | 2 | ||||
| -rw-r--r-- | sys/i386/ibcs2/ibcs2_misc.c | 2 | ||||
| -rw-r--r-- | sys/i386/linux/linux_machdep.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c index 836423d..83cb699 100644 --- a/sys/i386/i386/sys_machdep.c +++ b/sys/i386/i386/sys_machdep.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include "opt_kstack_pages.h" #include <sys/param.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/systm.h> #include <sys/lock.h> #include <sys/malloc.h> diff --git a/sys/i386/ibcs2/ibcs2_fcntl.c b/sys/i386/ibcs2/ibcs2_fcntl.c index d061b79..d2489df 100644 --- a/sys/i386/ibcs2/ibcs2_fcntl.c +++ b/sys/i386/ibcs2/ibcs2_fcntl.c @@ -32,7 +32,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/file.h> #include <sys/filedesc.h> diff --git a/sys/i386/ibcs2/ibcs2_ioctl.c b/sys/i386/ibcs2/ibcs2_ioctl.c index 03fa5f6..3275303 100644 --- a/sys/i386/ibcs2/ibcs2_ioctl.c +++ b/sys/i386/ibcs2/ibcs2_ioctl.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/consio.h> #include <sys/fcntl.h> #include <sys/file.h> diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c index 28cd83c..0eeb6de 100644 --- a/sys/i386/ibcs2/ibcs2_misc.c +++ b/sys/i386/ibcs2/ibcs2_misc.c @@ -57,7 +57,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/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c index 2d79204..5d69729 100644 --- a/sys/i386/linux/linux_machdep.c +++ b/sys/i386/linux/linux_machdep.c @@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/file.h> #include <sys/fcntl.h> #include <sys/imgact.h> |
