From owner-svn-src-head@freebsd.org  Mon Sep 19 18:44:45 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0D8BABE1C98;
 Mon, 19 Sep 2016 18:44:45 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 B9AFC1BFA;
 Mon, 19 Sep 2016 18:44:44 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8JIihvj094204;
 Mon, 19 Sep 2016 18:44:43 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8JIiht0094200;
 Mon, 19 Sep 2016 18:44:43 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201609191844.u8JIiht0094200@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 19 Sep 2016 18:44:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r305994 - in head/sys: amd64/linux
 boot/efi/loader/arch/amd64 boot/efi/loader/arch/i386 compat/linux
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Sep 2016 18:44:45 -0000

Author: emaste
Date: Mon Sep 19 18:44:43 2016
New Revision: 305994
URL: https://svnweb.freebsd.org/changeset/base/305994

Log:
  Catch up to sys/capability.h rename to sys/capsicum.h in r263232
  
  MFC after:	1 month
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/amd64/linux/linux_machdep.c
  head/sys/boot/efi/loader/arch/amd64/ldscript.amd64
  head/sys/boot/efi/loader/arch/i386/ldscript.i386
  head/sys/compat/linux/linux_event.c

Modified: head/sys/amd64/linux/linux_machdep.c
==============================================================================
--- head/sys/amd64/linux/linux_machdep.c	Mon Sep 19 18:42:58 2016	(r305993)
+++ head/sys/amd64/linux/linux_machdep.c	Mon Sep 19 18:44:43 2016	(r305994)
@@ -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: head/sys/boot/efi/loader/arch/amd64/ldscript.amd64
==============================================================================
--- head/sys/boot/efi/loader/arch/amd64/ldscript.amd64	Mon Sep 19 18:42:58 2016	(r305993)
+++ head/sys/boot/efi/loader/arch/amd64/ldscript.amd64	Mon Sep 19 18:44:43 2016	(r305994)
@@ -19,7 +19,7 @@ SECTIONS
     /* .gnu.warning sections are handled specially by elf32.em. */
     *(.gnu.warning)
     *(.plt)
-  } =0xCC
+  } =0xCCCCCCCC
   . = ALIGN(4096);
   .data		: {
     *(.rodata .rodata.* .gnu.linkonce.r.*)

Modified: head/sys/boot/efi/loader/arch/i386/ldscript.i386
==============================================================================
--- head/sys/boot/efi/loader/arch/i386/ldscript.i386	Mon Sep 19 18:42:58 2016	(r305993)
+++ head/sys/boot/efi/loader/arch/i386/ldscript.i386	Mon Sep 19 18:44:43 2016	(r305994)
@@ -14,7 +14,7 @@ SECTIONS
     /* .gnu.warning sections are handled specially by elf32.em. */
     *(.gnu.warning)
     *(.plt)
-  } =0xCC
+  } =0xCCCCCCCC
   . = ALIGN(4096);
   .data		: {
     *(.rodata .rodata.* .gnu.linkonce.r.*)

Modified: head/sys/compat/linux/linux_event.c
==============================================================================
--- head/sys/compat/linux/linux_event.c	Mon Sep 19 18:42:58 2016	(r305993)
+++ head/sys/compat/linux/linux_event.c	Mon Sep 19 18:44:43 2016	(r305994)
@@ -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>