From owner-p4-projects@FreeBSD.ORG  Sun May 28 00:09:01 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9268116A50E; Sun, 28 May 2006 00:04:32 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3425516A870
	for <perforce@freebsd.org>; Sat, 27 May 2006 23:57:56 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 00B3043D46
	for <perforce@freebsd.org>; Sat, 27 May 2006 23:57:56 +0000 (GMT)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4RNunfo036426
	for <perforce@freebsd.org>; Sat, 27 May 2006 23:56:49 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4RNunlt036423
	for perforce@freebsd.org; Sat, 27 May 2006 23:56:49 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sat, 27 May 2006 23:56:49 GMT
Message-Id: <200605272356.k4RNunlt036423@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 97983 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 May 2006 00:09:02 -0000

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

Change 97983 by kmacy@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