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/compat/freebsd32 | |
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/compat/freebsd32')
-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 |
3 files changed, 3 insertions, 3 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 552b26a..b634b30 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 5e2c912..55bd4a5 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> |