summaryrefslogtreecommitdiffstats
path: root/sys/security
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2015-03-19 13:37:36 +0000
committerrwatson <rwatson@FreeBSD.org>2015-03-19 13:37:36 +0000
commit6102a34d3875e6b3f22e0245d7698fe549c674a1 (patch)
treedf3b1e38c02357cff6357a78741ce42d4959b672 /sys/security
parent24836ef695b4d0b47117fe6ed0d34b16e37a68aa (diff)
downloadFreeBSD-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/security')
-rw-r--r--sys/security/mac/mac_syscalls.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c
index 6405586..f084ea4 100644
--- a/sys/security/mac/mac_syscalls.c
+++ b/sys/security/mac/mac_syscalls.c
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
#include "opt_mac.h"
#include <sys/param.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/fcntl.h>
#include <sys/kernel.h>
#include <sys/lock.h>
OpenPOWER on IntegriCloud