svn commit: r263233 - in head/sys: amd64/amd64 amd64/linux32 arm/arm cam/ctl cddl/compat/opensolaris/sys compat/freebsd32 compat/linux compat/svr4 dev/aac dev/aacraid dev/amr dev/filemon dev/hwpmc ...
Robert Watson
rwatson at FreeBSD.org
Sun Mar 16 10:56:12 UTC 2014
Author: rwatson
Date: Sun Mar 16 10:55:57 2014
New Revision: 263233
URL: http://svnweb.freebsd.org/changeset/base/263233
Log:
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
Modified:
head/sys/amd64/amd64/sys_machdep.c
head/sys/amd64/linux32/linux32_machdep.c
head/sys/arm/arm/sys_machdep.c
head/sys/cam/ctl/ctl_frontend_iscsi.c
head/sys/cddl/compat/opensolaris/sys/file.h
head/sys/compat/freebsd32/freebsd32_capability.c
head/sys/compat/freebsd32/freebsd32_ioctl.c
head/sys/compat/freebsd32/freebsd32_misc.c
head/sys/compat/linux/linux_file.c
head/sys/compat/linux/linux_ioctl.c
head/sys/compat/linux/linux_socket.c
head/sys/compat/svr4/svr4_fcntl.c
head/sys/compat/svr4/svr4_filio.c
head/sys/compat/svr4/svr4_ioctl.c
head/sys/compat/svr4/svr4_misc.c
head/sys/compat/svr4/svr4_stream.c
head/sys/dev/aac/aac_linux.c
head/sys/dev/aacraid/aacraid_linux.c
head/sys/dev/amr/amr_linux.c
head/sys/dev/filemon/filemon.c
head/sys/dev/hwpmc/hwpmc_logging.c
head/sys/dev/ipmi/ipmi_linux.c
head/sys/dev/iscsi/icl.c
head/sys/dev/iscsi/icl_proxy.c
head/sys/dev/iscsi_initiator/iscsi.c
head/sys/dev/mfi/mfi_linux.c
head/sys/dev/tdfx/tdfx_linux.c
head/sys/fs/fdescfs/fdesc_vnops.c
head/sys/fs/fuse/fuse_vfsops.c
head/sys/fs/nfsclient/nfs_clport.c
head/sys/fs/nfsserver/nfs_nfsdport.c
head/sys/i386/i386/sys_machdep.c
head/sys/i386/ibcs2/ibcs2_fcntl.c
head/sys/i386/ibcs2/ibcs2_ioctl.c
head/sys/i386/ibcs2/ibcs2_misc.c
head/sys/i386/linux/linux_machdep.c
head/sys/kern/imgact_elf.c
head/sys/kern/kern_descrip.c
head/sys/kern/kern_event.c
head/sys/kern/kern_exec.c
head/sys/kern/kern_exit.c
head/sys/kern/kern_ktrace.c
head/sys/kern/kern_sig.c
head/sys/kern/kern_sysctl.c
head/sys/kern/subr_capability.c
head/sys/kern/subr_syscall.c
head/sys/kern/subr_trap.c
head/sys/kern/sys_capability.c
head/sys/kern/sys_generic.c
head/sys/kern/sys_procdesc.c
head/sys/kern/tty.c
head/sys/kern/uipc_mqueue.c
head/sys/kern/uipc_sem.c
head/sys/kern/uipc_shm.c
head/sys/kern/uipc_syscalls.c
head/sys/kern/uipc_usrreq.c
head/sys/kern/vfs_acl.c
head/sys/kern/vfs_aio.c
head/sys/kern/vfs_extattr.c
head/sys/kern/vfs_lookup.c
head/sys/kern/vfs_syscalls.c
head/sys/netsmb/smb_dev.c
head/sys/nfsserver/nfs_srvkrpc.c
head/sys/security/mac/mac_syscalls.c
head/sys/sparc64/sparc64/sys_machdep.c
head/sys/ufs/ffs/ffs_alloc.c
head/sys/vm/vm_mmap.c
Modified: head/sys/amd64/amd64/sys_machdep.c
==============================================================================
--- head/sys/amd64/amd64/sys_machdep.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/amd64/amd64/sys_machdep.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -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>
Modified: head/sys/amd64/linux32/linux32_machdep.c
==============================================================================
--- head/sys/amd64/linux32/linux32_machdep.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/amd64/linux32/linux32_machdep.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -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>
Modified: head/sys/arm/arm/sys_machdep.c
==============================================================================
--- head/sys/arm/arm/sys_machdep.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/arm/arm/sys_machdep.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/proc.h>
#include <sys/sysproto.h>
#include <sys/syscall.h>
Modified: head/sys/cam/ctl/ctl_frontend_iscsi.c
==============================================================================
--- head/sys/cam/ctl/ctl_frontend_iscsi.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/cam/ctl/ctl_frontend_iscsi.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -37,7 +37,7 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/condvar.h>
#include <sys/file.h>
#include <sys/kernel.h>
Modified: head/sys/cddl/compat/opensolaris/sys/file.h
==============================================================================
--- head/sys/cddl/compat/opensolaris/sys/file.h Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/cddl/compat/opensolaris/sys/file.h Sun Mar 16 10:55:57 2014 (r263233)
@@ -36,7 +36,7 @@
#ifdef _KERNEL
typedef struct file file_t;
-#include <sys/capability.h>
+#include <sys/capsicum.h>
static __inline file_t *
getf(int fd, cap_rights_t *rightsp)
Modified: head/sys/compat/freebsd32/freebsd32_capability.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_capability.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/compat/freebsd32/freebsd32_capability.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -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>
Modified: head/sys/compat/freebsd32/freebsd32_ioctl.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_ioctl.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/compat/freebsd32/freebsd32_ioctl.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -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>
Modified: head/sys/compat/freebsd32/freebsd32_misc.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_misc.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/compat/freebsd32/freebsd32_misc.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -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>
Modified: head/sys/compat/linux/linux_file.c
==============================================================================
--- head/sys/compat/linux/linux_file.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/compat/linux/linux_file.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -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>
Modified: head/sys/compat/linux/linux_ioctl.c
==============================================================================
--- head/sys/compat/linux/linux_ioctl.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/compat/linux/linux_ioctl.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -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>
Modified: head/sys/compat/linux/linux_socket.c
==============================================================================
--- head/sys/compat/linux/linux_socket.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/compat/linux/linux_socket.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -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>
Modified: head/sys/compat/svr4/svr4_fcntl.c
==============================================================================
--- head/sys/compat/svr4/svr4_fcntl.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/compat/svr4/svr4_fcntl.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -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>
Modified: head/sys/compat/svr4/svr4_filio.c
==============================================================================
--- head/sys/compat/svr4/svr4_filio.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/compat/svr4/svr4_filio.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -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>
Modified: head/sys/compat/svr4/svr4_ioctl.c
==============================================================================
--- head/sys/compat/svr4/svr4_ioctl.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/compat/svr4/svr4_ioctl.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -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>
Modified: head/sys/compat/svr4/svr4_misc.c
==============================================================================
--- head/sys/compat/svr4/svr4_misc.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/compat/svr4/svr4_misc.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -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>
Modified: head/sys/compat/svr4/svr4_stream.c
==============================================================================
--- head/sys/compat/svr4/svr4_stream.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/compat/svr4/svr4_stream.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -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>
Modified: head/sys/dev/aac/aac_linux.c
==============================================================================
--- head/sys/dev/aac/aac_linux.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/dev/aac/aac_linux.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -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/kernel.h>
#include <sys/module.h>
Modified: head/sys/dev/aacraid/aacraid_linux.c
==============================================================================
--- head/sys/dev/aacraid/aacraid_linux.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/dev/aacraid/aacraid_linux.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#if __FreeBSD_version >= 900000
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#endif
#include <sys/systm.h>
#include <sys/conf.h>
Modified: head/sys/dev/amr/amr_linux.c
==============================================================================
--- head/sys/dev/amr/amr_linux.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/dev/amr/amr_linux.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -30,7 +30,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/kernel.h>
#include <sys/module.h>
Modified: head/sys/dev/filemon/filemon.c
==============================================================================
--- head/sys/dev/filemon/filemon.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/dev/filemon/filemon.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
#include <sys/uio.h>
#if __FreeBSD_version >= 900041
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#endif
#include "filemon.h"
Modified: head/sys/dev/hwpmc/hwpmc_logging.c
==============================================================================
--- head/sys/dev/hwpmc/hwpmc_logging.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/dev/hwpmc/hwpmc_logging.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -37,7 +37,7 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/file.h>
#include <sys/kernel.h>
#include <sys/kthread.h>
Modified: head/sys/dev/ipmi/ipmi_linux.c
==============================================================================
--- head/sys/dev/ipmi/ipmi_linux.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/dev/ipmi/ipmi_linux.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -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/kernel.h>
#include <sys/module.h>
Modified: head/sys/dev/iscsi/icl.c
==============================================================================
--- head/sys/dev/iscsi/icl.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/dev/iscsi/icl.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -35,7 +35,7 @@
*/
#include <sys/param.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/condvar.h>
#include <sys/conf.h>
#include <sys/file.h>
Modified: head/sys/dev/iscsi/icl_proxy.c
==============================================================================
--- head/sys/dev/iscsi/icl_proxy.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/dev/iscsi/icl_proxy.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -69,7 +69,7 @@
#ifdef ICL_KERNEL_PROXY
#include <sys/param.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/condvar.h>
#include <sys/conf.h>
#include <sys/kernel.h>
Modified: head/sys/dev/iscsi_initiator/iscsi.c
==============================================================================
--- head/sys/dev/iscsi_initiator/iscsi.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/dev/iscsi_initiator/iscsi.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$");
#include "opt_iscsi_initiator.h"
#include <sys/param.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/kernel.h>
#include <sys/module.h>
#include <sys/conf.h>
Modified: head/sys/dev/mfi/mfi_linux.c
==============================================================================
--- head/sys/dev/mfi/mfi_linux.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/dev/mfi/mfi_linux.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -29,7 +29,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/kernel.h>
#include <sys/module.h>
Modified: head/sys/dev/tdfx/tdfx_linux.c
==============================================================================
--- head/sys/dev/tdfx/tdfx_linux.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/dev/tdfx/tdfx_linux.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -28,7 +28,7 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/file.h>
#include <sys/kernel.h>
#include <sys/module.h>
Modified: head/sys/fs/fdescfs/fdesc_vnops.c
==============================================================================
--- head/sys/fs/fdescfs/fdesc_vnops.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/fs/fdescfs/fdesc_vnops.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -40,7 +40,7 @@
#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/filedesc.h>
Modified: head/sys/fs/fuse/fuse_vfsops.c
==============================================================================
--- head/sys/fs/fuse/fuse_vfsops.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/fs/fuse/fuse_vfsops.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$");
#include <sys/errno.h>
#include <sys/param.h>
#include <sys/kernel.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/conf.h>
#include <sys/filedesc.h>
#include <sys/uio.h>
Modified: head/sys/fs/nfsclient/nfs_clport.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clport.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/fs/nfsclient/nfs_clport.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
#include "opt_inet6.h"
-#include <sys/capability.h>
+#include <sys/capsicum.h>
/*
* generally, I don't like #includes inside .h files, but it seems to
Modified: head/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdport.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/fs/nfsserver/nfs_nfsdport.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include <sys/capability.h>
+#include <sys/capsicum.h>
/*
* Functions that perform the vfs operations required by the routines in
Modified: head/sys/i386/i386/sys_machdep.c
==============================================================================
--- head/sys/i386/i386/sys_machdep.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/i386/i386/sys_machdep.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -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>
Modified: head/sys/i386/ibcs2/ibcs2_fcntl.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_fcntl.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/i386/ibcs2/ibcs2_fcntl.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -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>
Modified: head/sys/i386/ibcs2/ibcs2_ioctl.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_ioctl.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/i386/ibcs2/ibcs2_ioctl.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -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>
Modified: head/sys/i386/ibcs2/ibcs2_misc.c
==============================================================================
--- head/sys/i386/ibcs2/ibcs2_misc.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/i386/ibcs2/ibcs2_misc.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -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>
Modified: head/sys/i386/linux/linux_machdep.c
==============================================================================
--- head/sys/i386/linux/linux_machdep.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/i386/linux/linux_machdep.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -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>
Modified: head/sys/kern/imgact_elf.c
==============================================================================
--- head/sys/kern/imgact_elf.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/kern/imgact_elf.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
#include "opt_core.h"
#include <sys/param.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/exec.h>
#include <sys/fcntl.h>
#include <sys/imgact.h>
Modified: head/sys/kern/kern_descrip.c
==============================================================================
--- head/sys/kern/kern_descrip.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/kern/kern_descrip.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -45,7 +45,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/domain.h>
#include <sys/fcntl.h>
Modified: head/sys/kern/kern_event.c
==============================================================================
--- head/sys/kern/kern_event.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/kern/kern_event.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -34,7 +34,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/mutex.h>
Modified: head/sys/kern/kern_exec.c
==============================================================================
--- head/sys/kern/kern_exec.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/kern/kern_exec.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -33,9 +33,9 @@ __FBSDID("$FreeBSD$");
#include "opt_vm.h"
#include <sys/param.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/systm.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/eventhandler.h>
#include <sys/lock.h>
#include <sys/mutex.h>
Modified: head/sys/kern/kern_exit.c
==============================================================================
--- head/sys/kern/kern_exit.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/kern/kern_exit.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -43,7 +43,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/eventhandler.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
Modified: head/sys/kern/kern_ktrace.c
==============================================================================
--- head/sys/kern/kern_ktrace.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/kern/kern_ktrace.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
#include "opt_ktrace.h"
#include <sys/param.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/systm.h>
#include <sys/fcntl.h>
#include <sys/kernel.h>
Modified: head/sys/kern/kern_sig.c
==============================================================================
--- head/sys/kern/kern_sig.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/kern/kern_sig.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
#include <sys/signalvar.h>
#include <sys/vnode.h>
#include <sys/acct.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/condvar.h>
#include <sys/event.h>
#include <sys/fcntl.h>
Modified: head/sys/kern/kern_sysctl.c
==============================================================================
--- head/sys/kern/kern_sysctl.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/kern/kern_sysctl.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/fail.h>
#include <sys/systm.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/kernel.h>
#include <sys/sysctl.h>
#include <sys/malloc.h>
Modified: head/sys/kern/subr_capability.c
==============================================================================
--- head/sys/kern/subr_capability.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/kern/subr_capability.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -36,13 +36,13 @@ __FBSDID("$FreeBSD$");
#ifdef _KERNEL
#include <sys/types.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/systm.h>
#include <machine/stdarg.h>
#else /* !_KERNEL */
#include <sys/types.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <assert.h>
#include <stdarg.h>
Modified: head/sys/kern/subr_syscall.c
==============================================================================
--- head/sys/kern/subr_syscall.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/kern/subr_syscall.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -43,7 +43,7 @@
__FBSDID("$FreeBSD$");
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/ktr.h>
#ifdef KTRACE
#include <sys/uio.h>
Modified: head/sys/kern/subr_trap.c
==============================================================================
--- head/sys/kern/subr_trap.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/kern/subr_trap.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/bus.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/mutex.h>
Modified: head/sys/kern/sys_capability.c
==============================================================================
--- head/sys/kern/sys_capability.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/kern/sys_capability.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$");
#include "opt_ktrace.h"
#include <sys/param.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/file.h>
#include <sys/filedesc.h>
#include <sys/kernel.h>
Modified: head/sys/kern/sys_generic.c
==============================================================================
--- head/sys/kern/sys_generic.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/kern/sys_generic.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -44,7 +44,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/filedesc.h>
#include <sys/filio.h>
#include <sys/fcntl.h>
Modified: head/sys/kern/sys_procdesc.c
==============================================================================
--- head/sys/kern/sys_procdesc.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/kern/sys_procdesc.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -62,7 +62,7 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/fcntl.h>
#include <sys/file.h>
#include <sys/filedesc.h>
Modified: head/sys/kern/tty.c
==============================================================================
--- head/sys/kern/tty.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/kern/tty.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$");
#include "opt_compat.h"
#include <sys/param.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/conf.h>
#include <sys/cons.h>
#include <sys/fcntl.h>
Modified: head/sys/kern/uipc_mqueue.c
==============================================================================
--- head/sys/kern/uipc_mqueue.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/kern/uipc_mqueue.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/limits.h>
#include <sys/buf.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/dirent.h>
#include <sys/event.h>
#include <sys/eventhandler.h>
Modified: head/sys/kern/uipc_sem.c
==============================================================================
--- head/sys/kern/uipc_sem.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/kern/uipc_sem.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
#include "opt_posix.h"
#include <sys/param.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/condvar.h>
#include <sys/fcntl.h>
#include <sys/file.h>
Modified: head/sys/kern/uipc_shm.c
==============================================================================
--- head/sys/kern/uipc_shm.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/kern/uipc_shm.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
#include "opt_capsicum.h"
#include <sys/param.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/fcntl.h>
#include <sys/file.h>
#include <sys/filedesc.h>
Modified: head/sys/kern/uipc_syscalls.c
==============================================================================
--- head/sys/kern/uipc_syscalls.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/kern/uipc_syscalls.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/condvar.h>
#include <sys/kernel.h>
#include <sys/lock.h>
Modified: head/sys/kern/uipc_usrreq.c
==============================================================================
--- head/sys/kern/uipc_usrreq.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/kern/uipc_usrreq.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$");
#include "opt_ddb.h"
#include <sys/param.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/domain.h>
#include <sys/fcntl.h>
#include <sys/malloc.h> /* XXX must be before <sys/file.h> */
Modified: head/sys/kern/vfs_acl.c
==============================================================================
--- head/sys/kern/vfs_acl.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/kern/vfs_acl.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -38,7 +38,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/fcntl.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
Modified: head/sys/kern/vfs_aio.c
==============================================================================
--- head/sys/kern/vfs_aio.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/kern/vfs_aio.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -28,7 +28,7 @@ __FBSDID("$FreeBSD$");
#include <sys/malloc.h>
#include <sys/bio.h>
#include <sys/buf.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/eventhandler.h>
#include <sys/sysproto.h>
#include <sys/filedesc.h>
Modified: head/sys/kern/vfs_extattr.c
==============================================================================
--- head/sys/kern/vfs_extattr.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/kern/vfs_extattr.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/lock.h>
#include <sys/mount.h>
#include <sys/mutex.h>
Modified: head/sys/kern/vfs_lookup.c
==============================================================================
--- head/sys/kern/vfs_lookup.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/kern/vfs_lookup.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/fcntl.h>
#include <sys/jail.h>
#include <sys/lock.h>
Modified: head/sys/kern/vfs_syscalls.c
==============================================================================
--- head/sys/kern/vfs_syscalls.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/kern/vfs_syscalls.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/bio.h>
#include <sys/buf.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/disk.h>
#include <sys/sysent.h>
#include <sys/malloc.h>
Modified: head/sys/netsmb/smb_dev.c
==============================================================================
--- head/sys/netsmb/smb_dev.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/netsmb/smb_dev.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -29,7 +29,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/kernel.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/module.h>
#include <sys/systm.h>
#include <sys/conf.h>
Modified: head/sys/nfsserver/nfs_srvkrpc.c
==============================================================================
--- head/sys/nfsserver/nfs_srvkrpc.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/nfsserver/nfs_srvkrpc.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
#include "opt_kgssapi.h"
#include <sys/param.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/systm.h>
#include <sys/sysproto.h>
#include <sys/kernel.h>
Modified: head/sys/security/mac/mac_syscalls.c
==============================================================================
--- head/sys/security/mac/mac_syscalls.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/security/mac/mac_syscalls.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -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>
Modified: head/sys/sparc64/sparc64/sys_machdep.c
==============================================================================
--- head/sys/sparc64/sparc64/sys_machdep.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/sparc64/sparc64/sys_machdep.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -30,7 +30,7 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
Modified: head/sys/ufs/ffs/ffs_alloc.c
==============================================================================
--- head/sys/ufs/ffs/ffs_alloc.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/ufs/ffs/ffs_alloc.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -65,7 +65,7 @@ __FBSDID("$FreeBSD$");
#include "opt_quota.h"
#include <sys/param.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
#include <sys/systm.h>
#include <sys/bio.h>
#include <sys/buf.h>
Modified: head/sys/vm/vm_mmap.c
==============================================================================
--- head/sys/vm/vm_mmap.c Sun Mar 16 10:49:16 2014 (r263232)
+++ head/sys/vm/vm_mmap.c Sun Mar 16 10:55:57 2014 (r263233)
@@ -48,7 +48,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/mutex.h>
More information about the svn-src-head
mailing list