From owner-svn-src-head@FreeBSD.ORG  Sun Aug 31 09:05:02 2014
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id ED62BEBB;
 Sun, 31 Aug 2014 09:05:02 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D8B7D1C6E;
 Sun, 31 Aug 2014 09:05:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7V952DK014874;
 Sun, 31 Aug 2014 09:05:02 GMT (envelope-from peter@FreeBSD.org)
Received: (from peter@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7V952t6014873;
 Sun, 31 Aug 2014 09:05:02 GMT (envelope-from peter@FreeBSD.org)
Message-Id: <201408310905.s7V952t6014873@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: peter set sender to
 peter@FreeBSD.org using -f
From: Peter Wemm <peter@FreeBSD.org>
Date: Sun, 31 Aug 2014 09:05:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270871 -
 head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
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/options/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, 31 Aug 2014 09:05:03 -0000

Author: peter
Date: Sun Aug 31 09:05:02 2014
New Revision: 270871
URL: http://svnweb.freebsd.org/changeset/base/270871

Log:
  Move the restored #ifdef i386 test back inside the #ifdef _KERNEL block
  where it originally was.

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	Sun Aug 31 06:46:21 2014	(r270870)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Sun Aug 31 09:05:02 2014	(r270871)
@@ -2560,9 +2560,7 @@ arc_reclaim_needed(void)
 	    (btop(vmem_size(heap_arena, VMEM_FREE | VMEM_ALLOC)) >> 2))
 		return (1);
 #endif
-#endif	/* sun */
-
-#else
+#else	/* sun */
 #ifdef __i386__
 	/* i386 has KVA limits that the raw page counts above don't consider */
 	if (kmem_used() > (kmem_size() * 3) / 4) {
@@ -2571,6 +2569,9 @@ arc_reclaim_needed(void)
 		return (1);
 	}
 #endif
+#endif	/* sun */
+
+#else
 	if (spa_get_random(100) == 0)
 		return (1);
 #endif