]> CyberLeo.Net >> Repos - FreeBSD/stable/10.git/commit
Merge r263233 from HEAD to stable/10:
authorrwatson <rwatson@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Thu, 19 Mar 2015 13:37:36 +0000 (13:37 +0000)
committerrwatson <rwatson@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Thu, 19 Mar 2015 13:37:36 +0000 (13:37 +0000)
commitd288863b8499a74404e5a31dfadad2d26dd2e4f2
treedf3b1e38c02357cff6357a78741ce42d4959b672
parent4b3ffafc2a7b2dff20e8d830facaecdc6cdc0ce7
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.

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