From owner-svn-src-stable@FreeBSD.ORG  Thu Mar 19 13:38:04 2015
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4E6BD350;
 Thu, 19 Mar 2015 13:38:04 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 35038149;
 Thu, 19 Mar 2015 13:38:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2JDc4S5053753;
 Thu, 19 Mar 2015 13:38:04 GMT (envelope-from rwatson@FreeBSD.org)
Received: (from rwatson@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2JDbc4j053591;
 Thu, 19 Mar 2015 13:37:38 GMT (envelope-from rwatson@FreeBSD.org)
Message-Id: <201503191337.t2JDbc4j053591@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: rwatson set sender to
 rwatson@FreeBSD.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Date: Thu, 19 Mar 2015 13:37:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r280258 - in stable/10/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/h...
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Mar 2015 13:38:04 -0000

Author: rwatson
Date: Thu Mar 19 13:37:36 2015
New Revision: 280258
URL: https://svnweb.freebsd.org/changeset/base/280258

Log:
  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.

Modified:
  stable/10/sys/amd64/amd64/sys_machdep.c
  stable/10/sys/amd64/linux32/linux32_machdep.c
  stable/10/sys/arm/arm/sys_machdep.c
  stable/10/sys/cam/ctl/ctl_frontend_iscsi.c
  stable/10/sys/cddl/compat/opensolaris/sys/file.h
  stable/10/sys/compat/freebsd32/freebsd32_capability.c
  stable/10/sys/compat/freebsd32/freebsd32_ioctl.c
  stable/10/sys/compat/freebsd32/freebsd32_misc.c
  stable/10/sys/compat/linux/linux_file.c
  stable/10/sys/compat/linux/linux_ioctl.c
  stable/10/sys/compat/linux/linux_socket.c
  stable/10/sys/compat/svr4/svr4_fcntl.c
  stable/10/sys/compat/svr4/svr4_filio.c
  stable/10/sys/compat/svr4/svr4_ioctl.c
  stable/10/sys/compat/svr4/svr4_misc.c
  stable/10/sys/compat/svr4/svr4_stream.c
  stable/10/sys/dev/aac/aac_linux.c
  stable/10/sys/dev/aacraid/aacraid_linux.c
  stable/10/sys/dev/amr/amr_linux.c
  stable/10/sys/dev/filemon/filemon.c
  stable/10/sys/dev/hwpmc/hwpmc_logging.c
  stable/10/sys/dev/ipmi/ipmi_linux.c
  stable/10/sys/dev/iscsi/icl.c
  stable/10/sys/dev/iscsi/icl_proxy.c
  stable/10/sys/dev/iscsi_initiator/iscsi.c
  stable/10/sys/dev/mfi/mfi_linux.c
  stable/10/sys/dev/tdfx/tdfx_linux.c
  stable/10/sys/fs/fdescfs/fdesc_vnops.c
  stable/10/sys/fs/fuse/fuse_vfsops.c
  stable/10/sys/fs/nfsclient/nfs_clport.c
  stable/10/sys/fs/nfsserver/nfs_nfsdport.c
  stable/10/sys/i386/i386/sys_machdep.c
  stable/10/sys/i386/ibcs2/ibcs2_fcntl.c
  stable/10/sys/i386/ibcs2/ibcs2_ioctl.c
  stable/10/sys/i386/ibcs2/ibcs2_misc.c
  stable/10/sys/i386/linux/linux_machdep.c
  stable/10/sys/kern/imgact_elf.c
  stable/10/sys/kern/kern_descrip.c
  stable/10/sys/kern/kern_event.c
  stable/10/sys/kern/kern_exec.c
  stable/10/sys/kern/kern_exit.c
  stable/10/sys/kern/kern_ktrace.c
  stable/10/sys/kern/kern_sig.c
  stable/10/sys/kern/kern_sysctl.c
  stable/10/sys/kern/subr_capability.c
  stable/10/sys/kern/subr_syscall.c
  stable/10/sys/kern/subr_trap.c
  stable/10/sys/kern/sys_capability.c
  stable/10/sys/kern/sys_generic.c
  stable/10/sys/kern/sys_procdesc.c
  stable/10/sys/kern/tty.c
  stable/10/sys/kern/uipc_mqueue.c
  stable/10/sys/kern/uipc_sem.c
  stable/10/sys/kern/uipc_shm.c
  stable/10/sys/kern/uipc_syscalls.c
  stable/10/sys/kern/uipc_usrreq.c
  stable/10/sys/kern/vfs_acl.c
  stable/10/sys/kern/vfs_aio.c
  stable/10/sys/kern/vfs_extattr.c
  stable/10/sys/kern/vfs_lookup.c
  stable/10/sys/kern/vfs_syscalls.c
  stable/10/sys/netsmb/smb_dev.c
  stable/10/sys/nfsserver/nfs_srvkrpc.c
  stable/10/sys/security/mac/mac_syscalls.c
  stable/10/sys/sparc64/sparc64/sys_machdep.c
  stable/10/sys/ufs/ffs/ffs_alloc.c
  stable/10/sys/vm/vm_mmap.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/amd64/amd64/sys_machdep.c
==============================================================================
--- stable/10/sys/amd64/amd64/sys_machdep.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/amd64/amd64/sys_machdep.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/amd64/linux32/linux32_machdep.c
==============================================================================
--- stable/10/sys/amd64/linux32/linux32_machdep.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/amd64/linux32/linux32_machdep.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/arm/arm/sys_machdep.c
==============================================================================
--- stable/10/sys/arm/arm/sys_machdep.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/arm/arm/sys_machdep.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/cam/ctl/ctl_frontend_iscsi.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl_frontend_iscsi.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/cam/ctl/ctl_frontend_iscsi.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/cddl/compat/opensolaris/sys/file.h
==============================================================================
--- stable/10/sys/cddl/compat/opensolaris/sys/file.h	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/cddl/compat/opensolaris/sys/file.h	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/compat/freebsd32/freebsd32_capability.c
==============================================================================
--- stable/10/sys/compat/freebsd32/freebsd32_capability.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/compat/freebsd32/freebsd32_capability.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/compat/freebsd32/freebsd32_ioctl.c
==============================================================================
--- stable/10/sys/compat/freebsd32/freebsd32_ioctl.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/compat/freebsd32/freebsd32_ioctl.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/compat/freebsd32/freebsd32_misc.c
==============================================================================
--- stable/10/sys/compat/freebsd32/freebsd32_misc.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/compat/freebsd32/freebsd32_misc.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/compat/linux/linux_file.c
==============================================================================
--- stable/10/sys/compat/linux/linux_file.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/compat/linux/linux_file.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/compat/linux/linux_ioctl.c
==============================================================================
--- stable/10/sys/compat/linux/linux_ioctl.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/compat/linux/linux_ioctl.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/compat/linux/linux_socket.c
==============================================================================
--- stable/10/sys/compat/linux/linux_socket.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/compat/linux/linux_socket.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/compat/svr4/svr4_fcntl.c
==============================================================================
--- stable/10/sys/compat/svr4/svr4_fcntl.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/compat/svr4/svr4_fcntl.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/compat/svr4/svr4_filio.c
==============================================================================
--- stable/10/sys/compat/svr4/svr4_filio.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/compat/svr4/svr4_filio.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/compat/svr4/svr4_ioctl.c
==============================================================================
--- stable/10/sys/compat/svr4/svr4_ioctl.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/compat/svr4/svr4_ioctl.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/compat/svr4/svr4_misc.c
==============================================================================
--- stable/10/sys/compat/svr4/svr4_misc.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/compat/svr4/svr4_misc.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/compat/svr4/svr4_stream.c
==============================================================================
--- stable/10/sys/compat/svr4/svr4_stream.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/compat/svr4/svr4_stream.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/dev/aac/aac_linux.c
==============================================================================
--- stable/10/sys/dev/aac/aac_linux.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/dev/aac/aac_linux.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/dev/aacraid/aacraid_linux.c
==============================================================================
--- stable/10/sys/dev/aacraid/aacraid_linux.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/dev/aacraid/aacraid_linux.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/dev/amr/amr_linux.c
==============================================================================
--- stable/10/sys/dev/amr/amr_linux.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/dev/amr/amr_linux.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/dev/filemon/filemon.c
==============================================================================
--- stable/10/sys/dev/filemon/filemon.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/dev/filemon/filemon.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/dev/hwpmc/hwpmc_logging.c
==============================================================================
--- stable/10/sys/dev/hwpmc/hwpmc_logging.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/dev/hwpmc/hwpmc_logging.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/dev/ipmi/ipmi_linux.c
==============================================================================
--- stable/10/sys/dev/ipmi/ipmi_linux.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/dev/ipmi/ipmi_linux.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/dev/iscsi/icl.c
==============================================================================
--- stable/10/sys/dev/iscsi/icl.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/dev/iscsi/icl.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -37,7 +37,7 @@
 __FBSDID("$FreeBSD$");
 
 #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: stable/10/sys/dev/iscsi/icl_proxy.c
==============================================================================
--- stable/10/sys/dev/iscsi/icl_proxy.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/dev/iscsi/icl_proxy.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -71,7 +71,7 @@
 __FBSDID("$FreeBSD$");
 
 #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: stable/10/sys/dev/iscsi_initiator/iscsi.c
==============================================================================
--- stable/10/sys/dev/iscsi_initiator/iscsi.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/dev/iscsi_initiator/iscsi.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/dev/mfi/mfi_linux.c
==============================================================================
--- stable/10/sys/dev/mfi/mfi_linux.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/dev/mfi/mfi_linux.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/dev/tdfx/tdfx_linux.c
==============================================================================
--- stable/10/sys/dev/tdfx/tdfx_linux.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/dev/tdfx/tdfx_linux.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/fs/fdescfs/fdesc_vnops.c
==============================================================================
--- stable/10/sys/fs/fdescfs/fdesc_vnops.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/fs/fdescfs/fdesc_vnops.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/fs/fuse/fuse_vfsops.c
==============================================================================
--- stable/10/sys/fs/fuse/fuse_vfsops.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/fs/fuse/fuse_vfsops.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/fs/nfsclient/nfs_clport.c
==============================================================================
--- stable/10/sys/fs/nfsclient/nfs_clport.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/fs/nfsclient/nfs_clport.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet6.h"
 #include "opt_kdtrace.h"
 
-#include <sys/capability.h>
+#include <sys/capsicum.h>
 
 /*
  * generally, I don't like #includes inside .h files, but it seems to

Modified: stable/10/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- stable/10/sys/fs/nfsserver/nfs_nfsdport.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/fs/nfsserver/nfs_nfsdport.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/i386/i386/sys_machdep.c
==============================================================================
--- stable/10/sys/i386/i386/sys_machdep.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/i386/i386/sys_machdep.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/i386/ibcs2/ibcs2_fcntl.c
==============================================================================
--- stable/10/sys/i386/ibcs2/ibcs2_fcntl.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/i386/ibcs2/ibcs2_fcntl.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/i386/ibcs2/ibcs2_ioctl.c
==============================================================================
--- stable/10/sys/i386/ibcs2/ibcs2_ioctl.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/i386/ibcs2/ibcs2_ioctl.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/i386/ibcs2/ibcs2_misc.c
==============================================================================
--- stable/10/sys/i386/ibcs2/ibcs2_misc.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/i386/ibcs2/ibcs2_misc.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/i386/linux/linux_machdep.c
==============================================================================
--- stable/10/sys/i386/linux/linux_machdep.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/i386/linux/linux_machdep.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/kern/imgact_elf.c
==============================================================================
--- stable/10/sys/kern/imgact_elf.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/kern/imgact_elf.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/kern/kern_descrip.c
==============================================================================
--- stable/10/sys/kern/kern_descrip.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/kern/kern_descrip.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -46,7 +46,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: stable/10/sys/kern/kern_event.c
==============================================================================
--- stable/10/sys/kern/kern_event.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/kern/kern_event.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -33,7 +33,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: stable/10/sys/kern/kern_exec.c
==============================================================================
--- stable/10/sys/kern/kern_exec.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/kern/kern_exec.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -34,9 +34,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: stable/10/sys/kern/kern_exit.c
==============================================================================
--- stable/10/sys/kern/kern_exit.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/kern/kern_exit.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -45,7 +45,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: stable/10/sys/kern/kern_ktrace.c
==============================================================================
--- stable/10/sys/kern/kern_ktrace.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/kern/kern_ktrace.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/kern/kern_sig.c
==============================================================================
--- stable/10/sys/kern/kern_sig.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/kern/kern_sig.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -48,7 +48,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: stable/10/sys/kern/kern_sysctl.c
==============================================================================
--- stable/10/sys/kern/kern_sysctl.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/kern/kern_sysctl.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/kern/subr_capability.c
==============================================================================
--- stable/10/sys/kern/subr_capability.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/kern/subr_capability.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/kern/subr_syscall.c
==============================================================================
--- stable/10/sys/kern/subr_syscall.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/kern/subr_syscall.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -44,7 +44,7 @@
 
 __FBSDID("$FreeBSD$");
 
-#include <sys/capability.h>
+#include <sys/capsicum.h>
 #include <sys/ktr.h>
 #ifdef KTRACE
 #include <sys/uio.h>

Modified: stable/10/sys/kern/subr_trap.c
==============================================================================
--- stable/10/sys/kern/subr_trap.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/kern/subr_trap.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -51,7 +51,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: stable/10/sys/kern/sys_capability.c
==============================================================================
--- stable/10/sys/kern/sys_capability.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/kern/sys_capability.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/kern/sys_generic.c
==============================================================================
--- stable/10/sys/kern/sys_generic.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/kern/sys_generic.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/kern/sys_procdesc.c
==============================================================================
--- stable/10/sys/kern/sys_procdesc.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/kern/sys_procdesc.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -64,7 +64,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_procdesc.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: stable/10/sys/kern/tty.c
==============================================================================
--- stable/10/sys/kern/tty.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/kern/tty.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/kern/uipc_mqueue.c
==============================================================================
--- stable/10/sys/kern/uipc_mqueue.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/kern/uipc_mqueue.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/kern/uipc_sem.c
==============================================================================
--- stable/10/sys/kern/uipc_sem.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/kern/uipc_sem.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/kern/uipc_shm.c
==============================================================================
--- stable/10/sys/kern/uipc_shm.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/kern/uipc_shm.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_ktrace.h"
 
 #include <sys/param.h>
-#include <sys/capability.h>
+#include <sys/capsicum.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>

Modified: stable/10/sys/kern/uipc_syscalls.c
==============================================================================
--- stable/10/sys/kern/uipc_syscalls.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/kern/uipc_syscalls.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/kern/uipc_usrreq.c
==============================================================================
--- stable/10/sys/kern/uipc_usrreq.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/kern/uipc_usrreq.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/kern/vfs_acl.c
==============================================================================
--- stable/10/sys/kern/vfs_acl.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/kern/vfs_acl.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/kern/vfs_aio.c
==============================================================================
--- stable/10/sys/kern/vfs_aio.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/kern/vfs_aio.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/kern/vfs_extattr.c
==============================================================================
--- stable/10/sys/kern/vfs_extattr.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/kern/vfs_extattr.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/kern/vfs_lookup.c
==============================================================================
--- stable/10/sys/kern/vfs_lookup.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/kern/vfs_lookup.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -44,7 +44,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: stable/10/sys/kern/vfs_syscalls.c
==============================================================================
--- stable/10/sys/kern/vfs_syscalls.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/kern/vfs_syscalls.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -46,7 +46,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: stable/10/sys/netsmb/smb_dev.c
==============================================================================
--- stable/10/sys/netsmb/smb_dev.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/netsmb/smb_dev.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/nfsserver/nfs_srvkrpc.c
==============================================================================
--- stable/10/sys/nfsserver/nfs_srvkrpc.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/nfsserver/nfs_srvkrpc.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/security/mac/mac_syscalls.c
==============================================================================
--- stable/10/sys/security/mac/mac_syscalls.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/security/mac/mac_syscalls.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/sparc64/sparc64/sys_machdep.c
==============================================================================
--- stable/10/sys/sparc64/sparc64/sys_machdep.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/sparc64/sparc64/sys_machdep.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/ufs/ffs/ffs_alloc.c
==============================================================================
--- stable/10/sys/ufs/ffs/ffs_alloc.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/ufs/ffs/ffs_alloc.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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: stable/10/sys/vm/vm_mmap.c
==============================================================================
--- stable/10/sys/vm/vm_mmap.c	Thu Mar 19 13:33:15 2015	(r280257)
+++ stable/10/sys/vm/vm_mmap.c	Thu Mar 19 13:37:36 2015	(r280258)
@@ -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>