From owner-svn-src-stable@FreeBSD.ORG  Thu Mar 10 17:26:36 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 63C1C106564A;
	Thu, 10 Mar 2011 17:26:36 +0000 (UTC)
	(envelope-from pluknet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 520EE8FC17;
	Thu, 10 Mar 2011 17:26:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2AHQaKg050458;
	Thu, 10 Mar 2011 17:26:36 GMT (envelope-from pluknet@svn.freebsd.org)
Received: (from pluknet@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2AHQaxd050456;
	Thu, 10 Mar 2011 17:26:36 GMT (envelope-from pluknet@svn.freebsd.org)
Message-Id: <201103101726.p2AHQaxd050456@svn.freebsd.org>
From: Sergey Kandaurov <pluknet@FreeBSD.org>
Date: Thu, 10 Mar 2011 17:26:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r219454 - stable/8/sys/mips/conf
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Mar 2011 17:26:36 -0000

Author: pluknet
Date: Thu Mar 10 17:26:36 2011
New Revision: 219454
URL: http://svn.freebsd.org/changeset/base/219454

Log:
  Unbreak mips OCTEON1: there's no options MALLOC_DEBUG_MAXZONES in stable/8.
  
  This is a direct commit to 8.
  
  Approved by:	avg (mentor)

Modified:
  stable/8/sys/mips/conf/OCTEON1

Modified: stable/8/sys/mips/conf/OCTEON1
==============================================================================
--- stable/8/sys/mips/conf/OCTEON1	Thu Mar 10 16:51:28 2011	(r219453)
+++ stable/8/sys/mips/conf/OCTEON1	Thu Mar 10 17:26:36 2011	(r219454)
@@ -91,7 +91,6 @@ options 	INVARIANTS		# Enable calls of e
 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 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
 
 # Make an SMP-capable kernel by default
 options 	SMP			# Symmetric MultiProcessor Kernel