From owner-svn-src-head@FreeBSD.ORG Thu Feb 18 19:24:24 2010 Return-Path: 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 3A25310656B1; Thu, 18 Feb 2010 19:24:24 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 29E1E8FC1F; Thu, 18 Feb 2010 19:24:24 +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 o1IJOOON055877; Thu, 18 Feb 2010 19:24:24 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1IJOOth055875; Thu, 18 Feb 2010 19:24:24 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201002181924.o1IJOOth055875@svn.freebsd.org> From: Warner Losh Date: Thu, 18 Feb 2010 19:24:24 +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: r204054 - head/sys/mips/cavium 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Feb 2010 19:24:24 -0000 Author: imp Date: Thu Feb 18 19:24:23 2010 New Revision: 204054 URL: http://svn.freebsd.org/changeset/base/204054 Log: Parens around tertiary operator so that casting the result works... Modified: head/sys/mips/cavium/octeon_pcmap_regs.h Modified: head/sys/mips/cavium/octeon_pcmap_regs.h ============================================================================== --- head/sys/mips/cavium/octeon_pcmap_regs.h Thu Feb 18 19:06:30 2010 (r204053) +++ head/sys/mips/cavium/octeon_pcmap_regs.h Thu Feb 18 19:24:23 2010 (r204054) @@ -601,10 +601,9 @@ typedef enum { #define octeon_ptr_to_phys(ptr) \ - ((((mipsx_addr_size) ptr) >> MIPSX_ADDR_SIZE_KSEGX_BIT_SHIFT) == 2) ? \ + (((((mipsx_addr_size) ptr) >> MIPSX_ADDR_SIZE_KSEGX_BIT_SHIFT) == 2) ? \ ((mipsx_addr_size) ptr & MIPSX_ADDR_SIZE_KSEGX_MASK_REMOVED) : \ - (vtophys(ptr)) - + (vtophys(ptr))) #ifdef CODE_FOR_64_BIT_NEEDED static inline mipsx_addr_size octeon_ptr_to_phys (void *ptr)