From owner-svn-src-head@FreeBSD.ORG  Mon Dec 20 23:41:32 2010
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A3ADF1065698;
	Mon, 20 Dec 2010 23:41:32 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 92E758FC20;
	Mon, 20 Dec 2010 23:41:32 +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 oBKNfW8J098268;
	Mon, 20 Dec 2010 23:41:32 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBKNfWVr098266;
	Mon, 20 Dec 2010 23:41:32 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201012202341.oBKNfWVr098266@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Mon, 20 Dec 2010 23:41:32 +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: r216607 - head/sys/dev/cxgb/ulp/tom
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Mon, 20 Dec 2010 23:41:32 -0000

Author: alc
Date: Mon Dec 20 23:41:31 2010
New Revision: 216607
URL: http://svn.freebsd.org/changeset/base/216607

Log:
  The local variable "rv" is still required by vm_fault_hold_user_pages().

Modified:
  head/sys/dev/cxgb/ulp/tom/cxgb_vm.c

Modified: head/sys/dev/cxgb/ulp/tom/cxgb_vm.c
==============================================================================
--- head/sys/dev/cxgb/ulp/tom/cxgb_vm.c	Mon Dec 20 23:06:57 2010	(r216606)
+++ head/sys/dev/cxgb/ulp/tom/cxgb_vm.c	Mon Dec 20 23:41:31 2010	(r216607)
@@ -66,7 +66,7 @@ vm_fault_hold_user_pages(vm_map_t map, v
     int count, vm_prot_t prot)
 {
 	vm_offset_t end, va;
-	int faults;
+	int faults, rv;
 	pmap_t pmap;
 	vm_page_t m, *pages;
 	
@@ -124,8 +124,8 @@ vm_fault_hold_user_pages(vm_map_t map, v
 	 * trigger a fault where neccessary
 	 */
 	for (pages = mp, va = addr; va < end; va += PAGE_SIZE, pages++) {
-		if (*pages == NULL && vm_fault_hold(map, va, prot,
-		    VM_FAULT_NORMAL, pages) != KERN_SUCCESS)
+		if (*pages == NULL && (rv = vm_fault_hold(map, va, prot,
+		    VM_FAULT_NORMAL, pages)) != KERN_SUCCESS)
 			goto error;
 	}
 	return (0);