svn commit: r338666 - head/sys/arm/conf

[Ed Maste]

Author: emaste
Date: Thu Sep 13 21:00:17 2018
New Revision: 338666
URL: https://svnweb.freebsd.org/changeset/base/338666

Log:
  Enable Capsicum on armv6/armv7
  
  We ought to be consistent across our Tier-1 and nearly-Tier-1
  architectures, so enable Capsicum for 32-bit armv6/armv7 by default.
  
  PR:		204008
  Reviewed by:	ian, oshogbo
  Approved by:	re (gjb)
  Relnotes:	Yes
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D17023

Modified:
  head/sys/arm/conf/std.armv6
  head/sys/arm/conf/std.armv7

Modified: head/sys/arm/conf/std.armv6
==============================================================================
--- head/sys/arm/conf/std.armv6	Thu Sep 13 20:53:51 2018	(r338665)
+++ head/sys/arm/conf/std.armv6	Thu Sep 13 21:00:17 2018	(r338666)
@@ -41,6 +41,8 @@ options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B 
 options 	PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 options 	HWPMC_HOOKS		# Necessary kernel hooks for hwpmc(4)
+options 	CAPABILITY_MODE		# Capsicum capability mode
+options 	CAPABILITIES		# Capsicum capabilites
 options 	FREEBSD_BOOT_LOADER	# Process metadata passed from loader(8)
 options 	VFP			# Enable floating point hardware support
 options 	MAC			# Support for Mandatory Access Control (MAC)

Modified: head/sys/arm/conf/std.armv7
==============================================================================
--- head/sys/arm/conf/std.armv7	Thu Sep 13 20:53:51 2018	(r338665)
+++ head/sys/arm/conf/std.armv7	Thu Sep 13 21:00:17 2018	(r338666)
@@ -41,6 +41,8 @@ options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B 
 options 	PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 options 	HWPMC_HOOKS		# Necessary kernel hooks for hwpmc(4)
+options 	CAPABILITY_MODE		# Capsicum capability mode
+options 	CAPABILITIES		# Capsicum capabilites
 options 	FREEBSD_BOOT_LOADER	# Process metadata passed from loader(8)
 options 	VFP			# Enable floating point hardware support
 options 	MAC			# Support for Mandatory Access Control (MAC)