From owner-p4-projects@FreeBSD.ORG  Mon Mar 24 02:42:26 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 62EEB1065672; Mon, 24 Mar 2008 02:42:26 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 22FC51065670
	for <perforce@freebsd.org>; Mon, 24 Mar 2008 02:42:26 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0FC838FC13
	for <perforce@freebsd.org>; Mon, 24 Mar 2008 02:42:26 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2O2gQZI088446
	for <perforce@freebsd.org>; Mon, 24 Mar 2008 02:42:26 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2O2gPsf088444
	for perforce@freebsd.org; Mon, 24 Mar 2008 02:42:25 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 24 Mar 2008 02:42:25 GMT
Message-Id: <200803240242.m2O2gPsf088444@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 138405 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: Mon, 24 Mar 2008 02:42:26 -0000

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

Change 138405 by jb@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