From owner-svn-src-head@FreeBSD.ORG  Tue Dec 14 05:47:36 2010
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 0E01F106564A;
	Tue, 14 Dec 2010 05:47:36 +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 F176C8FC14;
	Tue, 14 Dec 2010 05:47:35 +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 oBE5lZc0005040;
	Tue, 14 Dec 2010 05:47:35 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBE5lZ4K005038;
	Tue, 14 Dec 2010 05:47:35 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201012140547.oBE5lZ4K005038@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Tue, 14 Dec 2010 05:47:35 +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: r216425 - 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: Tue, 14 Dec 2010 05:47:36 -0000

Author: alc
Date: Tue Dec 14 05:47:35 2010
New Revision: 216425
URL: http://svn.freebsd.org/changeset/base/216425

Log:
  Change memguard_fudge() so that it can handle km_max being zero.  Not
  every platform defines VM_KMEM_SIZE_MAX, and on those platforms km_max
  will be zero.
  
  Reviewed by:	mdf
  Tested by:	marius

Modified:
  head/sys/vm/memguard.c

Modified: head/sys/vm/memguard.c
==============================================================================
--- head/sys/vm/memguard.c	Tue Dec 14 01:28:33 2010	(r216424)
+++ head/sys/vm/memguard.c	Tue Dec 14 05:47:35 2010	(r216425)
@@ -184,9 +184,10 @@ memguard_fudge(unsigned long km_size, un
 	memguard_mapsize = km_max / vm_memguard_divisor;
 	/* size must be multiple of PAGE_SIZE */
 	memguard_mapsize = round_page(memguard_mapsize);
-	if (memguard_mapsize / (2 * PAGE_SIZE) > mem_pgs)
+	if (memguard_mapsize == 0 ||
+	    memguard_mapsize / (2 * PAGE_SIZE) > mem_pgs)
 		memguard_mapsize = mem_pgs * 2 * PAGE_SIZE;
-	if (km_size + memguard_mapsize > km_max)
+	if (km_max > 0 && km_size + memguard_mapsize > km_max)
 		return (km_max);
 	return (km_size + memguard_mapsize);
 }