svn commit: r305994 - in head/sys: amd64/linux boot/efi/loader/arch/amd64 boot/efi/loader/arch/i386 compat/linux

[Ed Maste]

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>