PERFORCE change 138405 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=138405

Change 138405 by jb at jb_freebsd1 on 2008/03/24 02:42:07

	Reset GENERIC to match current.

Affected files ...

.. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#32 edit

Differences ...

==== //depot/projects/dtrace/src/sys/i386/conf/GENERIC#32 (text+ko) ====

@@ -70,14 +70,14 @@
 options 	KDB			# Enable kernel debugger support.
 options 	DDB			# Support DDB.
 options 	DDB_CTF			# Load CTF data too.
-#options 	GDB			# Support remote GDB.
-#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 	GDB			# Support remote GDB.
+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
 
 # To make an SMP kernel, the next two lines are needed
-#options 	SMP			# Symmetric MultiProcessor Kernel
+options 	SMP			# Symmetric MultiProcessor Kernel
 device		apic			# I/O APIC
 
 # CPU frequency control