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/amd64 | |
| 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/amd64')
| -rw-r--r-- | sys/amd64/amd64/sys_machdep.c | 2 | ||||
| -rw-r--r-- | sys/amd64/linux32/linux32_machdep.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c index 1cc5f59..98d47b8 100644 --- a/sys/amd64/amd64/sys_machdep.c +++ b/sys/amd64/amd64/sys_machdep.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/kernel.h> #include <sys/lock.h> #include <sys/malloc.h> diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c index 3dd8f7a..2b955d0 100644 --- a/sys/amd64/linux32/linux32_machdep.c +++ b/sys/amd64/linux32/linux32_machdep.c @@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/file.h> #include <sys/fcntl.h> #include <sys/clock.h> |
