Date: Fri, 30 Dec 2016 16:22:24 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r310826 - in stable/11/sys: amd64/linux compat/linux Message-ID: <201612301622.uBUGMOCR075539@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Fri Dec 30 16:22:24 2016 New Revision: 310826 URL: https://svnweb.freebsd.org/changeset/base/310826 Log: MFC r305994: Catch up to sys/capability.h rename to sys/capsicum.h in r263232 Also include r305995, reverting an unintended change from r305994. Modified: stable/11/sys/amd64/linux/linux_machdep.c stable/11/sys/compat/linux/linux_event.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/amd64/linux/linux_machdep.c ============================================================================== --- stable/11/sys/amd64/linux/linux_machdep.c Fri Dec 30 16:19:19 2016 (r310825) +++ stable/11/sys/amd64/linux/linux_machdep.c Fri Dec 30 16:22:24 2016 (r310826) @@ -35,7 +35,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/dirent.h> #include <sys/file.h> #include <sys/fcntl.h> Modified: stable/11/sys/compat/linux/linux_event.c ============================================================================== --- stable/11/sys/compat/linux/linux_event.c Fri Dec 30 16:19:19 2016 (r310825) +++ stable/11/sys/compat/linux/linux_event.c Fri Dec 30 16:22:24 2016 (r310826) @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <sys/limits.h> #include <sys/lock.h> #include <sys/mutex.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/types.h> #include <sys/user.h> #include <sys/file.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612301622.uBUGMOCR075539>