From owner-p4-projects@FreeBSD.ORG  Wed Feb  2 16:30:02 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9A0961065670; Wed,  2 Feb 2011 16:30:02 +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 5ADE7106566B
	for <perforce@freebsd.org>; Wed,  2 Feb 2011 16:30:02 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 4160E8FC22
	for <perforce@freebsd.org>; Wed,  2 Feb 2011 16:30:02 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p12GU2dG076220
	for <perforce@freebsd.org>; Wed, 2 Feb 2011 16:30:02 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p12GU2eO076217
	for perforce@freebsd.org; Wed, 2 Feb 2011 16:30:02 GMT
	(envelope-from trasz@freebsd.org)
Date: Wed, 2 Feb 2011 16:30:02 GMT
Message-Id: <201102021630.p12GU2eO076217@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 188455 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Wed, 02 Feb 2011 16:30:02 -0000

http://p4web.freebsd.org/@@188455?ac=10

Change 188455 by trasz@trasz_victim on 2011/02/02 16:29:59

	Fix kernel config.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/amd64/conf/GENERIC#19 edit
.. //depot/projects/soc2009/trasz_limits/sys/i386/conf/GENERIC#20 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/amd64/conf/GENERIC#19 (text+ko) ====

@@ -78,7 +78,7 @@
 options 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
 
 options 	CONTAINERS
-options 	HRL
+options 	RCTL
 
 # Make an SMP-capable kernel by default
 options 	SMP			# Symmetric MultiProcessor Kernel

==== //depot/projects/soc2009/trasz_limits/sys/i386/conf/GENERIC#20 (text+ko) ====

@@ -77,6 +77,9 @@
 options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 options 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
 
+options 	CONTAINERS
+options 	RCTL
+
 # To make an SMP kernel, the next two lines are needed
 options 	SMP			# Symmetric MultiProcessor Kernel
 device		apic			# I/O APIC