PERFORCE change 97983 for review

[Kip Macy]

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

Change 97983 by kmacy at kmacy_storage:sun4v_work on 2006/05/27 23:56:30

	check in Kris' local config changes

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/GENERIC#14 edit

Differences ...

==== //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/GENERIC#14 (text+ko) ====

@@ -43,6 +43,7 @@
 options 	NFSSERVER		# Network Filesystem Server
 options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
 #options 	MSDOSFS			# MSDOS Filesystem
+options		NULLFS
 options 	CD9660			# ISO 9660 Filesystem
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		# Pseudo-filesystem framework
@@ -69,6 +70,8 @@
 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		DEBUG_LOCKS
+options		DEBUG_VFS_LOCKS
 
 # To make an SMP kernel, the next line is needed
 options 	SMP			# Symmetric MultiProcessor Kernel
@@ -205,3 +208,6 @@
 #options			USBVERBOSE
 #options			DEBUG_LOCKS
 #options			DEBUG_VFS_LOCKS
+
+device		ccd
+options		SPIN_PROFILING