From owner-svn-src-head@FreeBSD.ORG  Sun May 22 17:46:16 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 97AE6106564A;
	Sun, 22 May 2011 17:46:16 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 89E858FC12;
	Sun, 22 May 2011 17:46:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4MHkG5P084086;
	Sun, 22 May 2011 17:46:16 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4MHkGi1084084;
	Sun, 22 May 2011 17:46:16 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201105221746.p4MHkGi1084084@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Sun, 22 May 2011 17:46:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222184 - head/sys/vm
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 May 2011 17:46:16 -0000

Author: alc
Date: Sun May 22 17:46:16 2011
New Revision: 222184
URL: http://svn.freebsd.org/changeset/base/222184

Log:
  Correct an error in r222163.  Unless UMA_MD_SMALL_ALLOC is defined,
  startup_alloc() must be used until uma_startup2() is called.
  
  Reported by:	jh

Modified:
  head/sys/vm/uma_core.c

Modified: head/sys/vm/uma_core.c
==============================================================================
--- head/sys/vm/uma_core.c	Sun May 22 16:32:44 2011	(r222183)
+++ head/sys/vm/uma_core.c	Sun May 22 17:46:16 2011	(r222184)
@@ -1318,9 +1318,13 @@ keg_ctor(void *mem, int size, void *udat
 #ifdef UMA_MD_SMALL_ALLOC
 		keg->uk_allocf = uma_small_alloc;
 		keg->uk_freef = uma_small_free;
-#endif
+
 		if (booted < UMA_STARTUP)
 			keg->uk_allocf = startup_alloc;
+#else
+		if (booted < UMA_STARTUP2)
+			keg->uk_allocf = startup_alloc;
+#endif
 	} else if (booted < UMA_STARTUP2 &&
 	    (keg->uk_flags & UMA_ZFLAG_INTERNAL))
 		keg->uk_allocf = startup_alloc;