svn commit: r233779 - stable/9/sys/powerpc/conf

[Nathan Whitehorn]

Author: nwhitehorn
Date: Mon Apr  2 12:00:35 2012
New Revision: 233779
URL: http://svn.freebsd.org/changeset/base/233779

Log:
  Turn off WITNESS, etc. for GENERIC64. This was missed in the stable/9
  branch in r226405.

Modified:
  stable/9/sys/powerpc/conf/GENERIC64

Modified: stable/9/sys/powerpc/conf/GENERIC64
==============================================================================
--- stable/9/sys/powerpc/conf/GENERIC64	Mon Apr  2 11:59:13 2012	(r233778)
+++ stable/9/sys/powerpc/conf/GENERIC64	Mon Apr  2 12:00:35 2012	(r233779)
@@ -66,16 +66,8 @@ options 	HWPMC_HOOKS		# Necessary kernel
 options 	AUDIT			# Security event auditing
 options 	MAC			# TrustedBSD MAC Framework
 options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
-
-# Debugging for use in -current
-options 	KDB			#Enable the kernel debugger
-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 	KDB			# Kernel debugger related code
+options 	KDB_TRACE		# Print a stack trace for a panic
 
 # Make an SMP-capable kernel by default
 options 	SMP			# Symmetric MultiProcessor Kernel