From owner-svn-src-head@FreeBSD.ORG  Thu Jun 18 07:27:12 2009
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 1B87E106566B;
	Thu, 18 Jun 2009 07:27:12 +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 0A9E28FC0C;
	Thu, 18 Jun 2009 07:27:12 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5I7RBQo002234;
	Thu, 18 Jun 2009 07:27:11 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5I7RBVn002232;
	Thu, 18 Jun 2009 07:27:11 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <200906180727.n5I7RBVn002232@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Thu, 18 Jun 2009 07:27:11 +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: r194429 - 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: Thu, 18 Jun 2009 07:27:12 -0000

Author: alc
Date: Thu Jun 18 07:27:11 2009
New Revision: 194429
URL: http://svn.freebsd.org/changeset/base/194429

Log:
  Add support for UMA_SLAB_KERNEL to page_free().  (While I'm here remove an
  unnecessary newline character from the end of two panic messages.)

Modified:
  head/sys/vm/uma_core.c

Modified: head/sys/vm/uma_core.c
==============================================================================
--- head/sys/vm/uma_core.c	Thu Jun 18 06:09:47 2009	(r194428)
+++ head/sys/vm/uma_core.c	Thu Jun 18 07:27:11 2009	(r194429)
@@ -1061,8 +1061,10 @@ page_free(void *mem, int size, u_int8_t 
 
 	if (flags & UMA_SLAB_KMEM)
 		map = kmem_map;
+	else if (flags & UMA_SLAB_KERNEL)
+		map = kernel_map;
 	else
-		panic("UMA: page_free used with invalid flags %d\n", flags);
+		panic("UMA: page_free used with invalid flags %d", flags);
 
 	kmem_free(map, (vm_offset_t)mem, size);
 }
@@ -1352,7 +1354,7 @@ keg_ctor(void *mem, int size, void *udat
 			printf("zone %s ipers %d rsize %d size %d\n",
 			    zone->uz_name, keg->uk_ipers, keg->uk_rsize,
 			    keg->uk_size);
-			panic("UMA slab won't fit.\n");
+			panic("UMA slab won't fit.");
 		}
 	}