From owner-svn-src-stable-7@FreeBSD.ORG  Wed Dec  2 15:24:58 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 51EC8106568D;
	Wed,  2 Dec 2009 15:24:58 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 404308FC14;
	Wed,  2 Dec 2009 15:24:58 +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 nB2FOvr5021717;
	Wed, 2 Dec 2009 15:24:57 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nB2FOvrv021715;
	Wed, 2 Dec 2009 15:24:57 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200912021524.nB2FOvrv021715@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 2 Dec 2009 15:24:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r200030 - stable/7/sys/vm
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Dec 2009 15:24:58 -0000

Author: jhb
Date: Wed Dec  2 15:24:57 2009
New Revision: 200030
URL: http://svn.freebsd.org/changeset/base/200030

Log:
  MFC 194429:
  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:
  stable/7/sys/vm/uma_core.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/vm/uma_core.c
==============================================================================
--- stable/7/sys/vm/uma_core.c	Wed Dec  2 15:20:31 2009	(r200029)
+++ stable/7/sys/vm/uma_core.c	Wed Dec  2 15:24:57 2009	(r200030)
@@ -1033,8 +1033,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);
 }
@@ -1292,7 +1294,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.");
 		}
 	}