svn commit: r211623 - stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Andriy Gapon]

Author: avg
Date: Sun Aug 22 13:27:33 2010
New Revision: 211623
URL: http://svn.freebsd.org/changeset/base/211623

Log:
  Fix a mismerge in r211581, MFC of r210427
  
  This is a direct commit.
  
  Reported by:	many
  Pointyhat to:	avg

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

Modified: stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Sun Aug 22 13:09:12 2010	(r211622)
+++ stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Sun Aug 22 13:27:33 2010	(r211623)
@@ -3296,7 +3296,6 @@ arc_memory_throttle(uint64_t reserve, ui
 {
 #ifdef _KERNEL
 	uint64_t inflight_data = arc_anon->arcs_size;
-	uint64_t available_memory = ptoa((uintmax_t)cnt.v_free_count);
 	uint64_t available_memory = ptoa((uintmax_t)cnt.v_free_count
 	    + cnt.v_cache_count);
 	static uint64_t page_load = 0;