From owner-svn-src-all@FreeBSD.ORG  Sun Aug 22 13:27:34 2010
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 101A2106566C;
	Sun, 22 Aug 2010 13:27:34 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F2C058FC1C;
	Sun, 22 Aug 2010 13:27:33 +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 o7MDRXTu005110;
	Sun, 22 Aug 2010 13:27:33 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7MDRXtp005108;
	Sun, 22 Aug 2010 13:27:33 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201008221327.o7MDRXtp005108@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sun, 22 Aug 2010 13:27:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r211623 -
	stable/7/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: Sun, 22 Aug 2010 13:27:34 -0000

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;