From owner-svn-src-all@FreeBSD.ORG  Sat May 16 20:09:08 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2B4571065714;
	Sat, 16 May 2009 20:09:07 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 99BFE8FC18;
	Sat, 16 May 2009 20:09:07 +0000 (UTC)
	(envelope-from kmacy@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 n4GK97fW001057;
	Sat, 16 May 2009 20:09:07 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4GK972k001056;
	Sat, 16 May 2009 20:09:07 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200905162009.n4GK972k001056@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 16 May 2009 20:09:07 +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: r192209 -
	head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 May 2009 20:09:08 -0000

Author: kmacy
Date: Sat May 16 20:09:07 2009
New Revision: 192209
URL: http://svn.freebsd.org/changeset/base/192209

Log:
  only use direct map if system has more than 2GB

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Sat May 16 19:18:13 2009	(r192208)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Sat May 16 20:09:07 2009	(r192209)
@@ -3432,7 +3432,7 @@ arc_init(void)
 	/* Start out with 1/8 of all memory */
 #if defined(_KERNEL) && (__amd64__)
 	arc_c = physmem*PAGE_SIZE / 8;
-	if (physmem*PAGE_SIZE > kmem_size())
+	if (physmem*PAGE_SIZE > kmem_size() && (physmem > (1UL<<31)))
 		arc_large_memory_enabled = 1;
 #else
 	arc_c = kmem_size() / 8;