Date: Sun, 31 Aug 2014 09:05:02 +0000 (UTC) From: Peter Wemm <peter@FreeBSD.org> 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 Message-ID: <201408310905.s7V952t6014873@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408310905.s7V952t6014873>