From owner-svn-src-projects@FreeBSD.ORG  Tue Nov 23 03:53:53 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 70E64106566C;
	Tue, 23 Nov 2010 03:53:53 +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 5FC958FC16;
	Tue, 23 Nov 2010 03:53:53 +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 oAN3rrAh015929;
	Tue, 23 Nov 2010 03:53:53 GMT (envelope-from jeff@svn.freebsd.org)
Received: (from jeff@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAN3rrDm015927;
	Tue, 23 Nov 2010 03:53:53 GMT (envelope-from jeff@svn.freebsd.org)
Message-Id: <201011230353.oAN3rrDm015927@svn.freebsd.org>
From: Jeff Roberson <jeff@FreeBSD.org>
Date: Tue, 23 Nov 2010 03:53:53 +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: r215731 -
	projects/ofed/head/sys/ofed/drivers/infiniband/core
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, 23 Nov 2010 03:53:53 -0000

Author: jeff
Date: Tue Nov 23 03:53:53 2010
New Revision: 215731
URL: http://svn.freebsd.org/changeset/base/215731

Log:
   - Fix a bug by enclosing the ternary operator in parentheses.  This was
     made more problematic by the definition of VM_MAP_WIRE_KERNEL as 0
     rather than a real value.
  
  Sponsored by:	Isilon Systems, iX Systems, and Panasas.

Modified:
  projects/ofed/head/sys/ofed/drivers/infiniband/core/umem.c

Modified: projects/ofed/head/sys/ofed/drivers/infiniband/core/umem.c
==============================================================================
--- projects/ofed/head/sys/ofed/drivers/infiniband/core/umem.c	Tue Nov 23 01:39:30 2010	(r215730)
+++ projects/ofed/head/sys/ofed/drivers/infiniband/core/umem.c	Tue Nov 23 03:53:53 2010	(r215731)
@@ -328,7 +328,7 @@ out:
 	}
 	error = vm_map_wire(&proc->p_vmspace->vm_map, start, end,
 	    VM_MAP_WIRE_USER | VM_MAP_WIRE_NOHOLES |
-	    umem->writable ? VM_MAP_WIRE_WRITE : 0);
+	    (umem->writable ? VM_MAP_WIRE_WRITE : 0));
 	if (error != KERN_SUCCESS) {
 		kfree(umem);
 		return ERR_PTR(-ENOMEM);