From owner-svn-src-projects@FreeBSD.ORG  Tue Aug 24 20:38:01 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E648F1065695;
	Tue, 24 Aug 2010 20:38:01 +0000 (UTC)
	(envelope-from jeff@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D606E8FC16;
	Tue, 24 Aug 2010 20:38:01 +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 o7OKc1rH087060;
	Tue, 24 Aug 2010 20:38:01 GMT (envelope-from jeff@svn.freebsd.org)
Received: (from jeff@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7OKc1lK087058;
	Tue, 24 Aug 2010 20:38:01 GMT (envelope-from jeff@svn.freebsd.org)
Message-Id: <201008242038.o7OKc1lK087058@svn.freebsd.org>
From: Jeff Roberson <jeff@FreeBSD.org>
Date: Tue, 24 Aug 2010 20:38:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r211769 -
	projects/ofed/head/sys/ofed/drivers/infiniband/hw/mlx4
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Aug 2010 20:38:02 -0000

Author: jeff
Date: Tue Aug 24 20:38:01 2010
New Revision: 211769
URL: http://svn.freebsd.org/changeset/base/211769

Log:
   - Re-enable umem_write_mtt so we actually write the userspace mappings
     to the card.
  
  Sponsored by:	Isilon Systems, iX Systems, and Panasas.

Modified:
  projects/ofed/head/sys/ofed/drivers/infiniband/hw/mlx4/mr.c

Modified: projects/ofed/head/sys/ofed/drivers/infiniband/hw/mlx4/mr.c
==============================================================================
--- projects/ofed/head/sys/ofed/drivers/infiniband/hw/mlx4/mr.c	Tue Aug 24 19:41:15 2010	(r211768)
+++ projects/ofed/head/sys/ofed/drivers/infiniband/hw/mlx4/mr.c	Tue Aug 24 20:38:01 2010	(r211769)
@@ -77,7 +77,6 @@ err_free:
 int mlx4_ib_umem_write_mtt(struct mlx4_ib_dev *dev, struct mlx4_mtt *mtt,
 			   struct ib_umem *umem)
 {
-#ifdef __linux__
 	u64 *pages;
 	struct ib_umem_chunk *chunk;
 	int i, j, k;
@@ -118,9 +117,6 @@ int mlx4_ib_umem_write_mtt(struct mlx4_i
 out:
 	free_page((unsigned long) pages);
 	return err;
-#else
-	return 0;
-#endif
 }
 
 static int handle_hugetlb_user_mr(struct ib_pd *pd, struct mlx4_ib_mr *mr,