Index: stable/11/sys/arm/conf/std.arm
===================================================================
--- stable/11/sys/arm/conf/std.arm	(revision 303162)
+++ stable/11/sys/arm/conf/std.arm	(revision 303163)
@@ -1,36 +1,11 @@
 # Standard kernel config items for all ARMv4/v5 systems.
 #
 # $FreeBSD$
 
 options 	COMPAT_FREEBSD10	# Compatible with FreeBSD10
 
 # Debugging support.  Always need this:
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 options 	KDB			# Enable kernel debugger support.
 options 	KDB_TRACE		# Print a stack trace for a panic.
 
-# For full debugger support use (turn off in stable branch):
-options 	DDB			# Support DDB
-#options 	DEADLKRES		# Enable the deadlock resolver
-options 	INVARIANTS		# Enable calls of extra sanity checking
-options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
-options 	WITNESS			# Enable checks to detect deadlocks and cycles
-options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
-#options 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
-options 	ALT_BREAK_TO_DEBUGGER	# Enter debugger on keyboard escape sequence
-options 	USB_DEBUG		# Enable usb debug support code
-
-# Optional extras, never enabled by default:
-#options 	BOOTVERBOSE
-#options 	DEBUG			# May result in extreme spewage
-#options 	KTR
-#options 	KTR_COMPILE=KTR_ALL
-#options 	KTR_ENTRIES=16384
-#options 	KTR_MASK=(KTR_SPARE2)
-#options 	KTR_VERBOSE=0
-#options 	USB_REQ_DEBUG
-#options 	USB_VERBOSE
-#options 	VERBOSE_SYSINIT		# Enable verbose sysinit messages
-
-
-
Index: stable/11/sys/arm/conf/std.armv6
===================================================================
--- stable/11/sys/arm/conf/std.armv6	(revision 303162)
+++ stable/11/sys/arm/conf/std.armv6	(revision 303163)
@@ -1,77 +1,54 @@
 # Standard kernel config items for all ARMv6/v7 systems.
 #
 # $FreeBSD$
 
 options 	ARM_L2_PIPT		# Only L2 PIPT is supported
 
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
 options 	IPSEC			# IP (v4/v6) security
 options 	SCTP			# Stream Control Transmission Protocol
 options 	FFS			# Berkeley Fast Filesystem
 options 	SOFTUPDATES		# Enable FFS soft updates support
 options 	UFS_ACL			# Support for access control lists
 options 	UFS_DIRHASH		# Improve performance on big directories
 options 	UFS_GJOURNAL		# Enable gjournal-based UFS journaling
 options 	QUOTA			# Enable disk quotas for UFS
 options 	NFSCL			# Network Filesystem Client
 options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
 options 	MSDOSFS			# MSDOS Filesystem
 options 	CD9660			# ISO 9660 Filesystem
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		# Pseudo-filesystem framework
 options 	TMPFS			# Efficient memory filesystem
 options 	GEOM_PART_GPT		# GUID Partition Tables
 options 	GEOM_PART_BSD		# BSD partition scheme
 options 	GEOM_PART_MBR		# MBR partition scheme
 options 	GEOM_LABEL		# Provides labelization
 options 	COMPAT_43		# Compatible with BSD 4.3 [KEEP THIS!]
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
 options 	KTRACE			# ktrace(1) support
 options 	SYSVSHM			# SYSV-style shared memory
 options 	SYSVMSG			# SYSV-style message queues
 options 	SYSVSEM			# SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 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 	FREEBSD_BOOT_LOADER	# Process metadata passed from loader(8)
 options 	VFP			# Enable floating point hardware support
 
 options 	COMPAT_FREEBSD10	# Compatible with FreeBSD10
 
 # DTrace support
 options 	KDTRACE_HOOKS		# Kernel DTrace hooks
 options 	DDB_CTF			# all architectures - kernel ELF linker loads CTF data
 makeoptions	WITH_CTF=1
 
 # Debugging support.  Always need this:
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 options 	KDB			# Enable kernel debugger support.
 options 	KDB_TRACE		# Print a stack trace for a panic.
 
-# For full debugger support use (turn off in stable branch):
-options 	DDB			# Support DDB
-#options 	DEADLKRES		# Enable the deadlock resolver
-options 	INVARIANTS		# Enable calls of extra sanity checking
-options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
-options 	WITNESS			# Enable checks to detect deadlocks and cycles
-options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
-options 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
-options 	ALT_BREAK_TO_DEBUGGER	# Enter debugger on keyboard escape sequence
-options 	USB_DEBUG		# Enable usb debug support code
-
-# Optional extras, never enabled by default:
-#options 	BOOTVERBOSE
-#options 	DEBUG			# May result in extreme spewage
-#options 	KTR
-#options 	KTR_COMPILE=KTR_ALL
-#options 	KTR_ENTRIES=16384
-#options 	KTR_MASK=(KTR_SPARE2)
-#options 	KTR_VERBOSE=0
-#options 	USB_REQ_DEBUG
-#options 	USB_VERBOSE
-#options 	VERBOSE_SYSINIT		# Enable verbose sysinit messages
-