From owner-svn-src-projects@FreeBSD.ORG  Thu Dec 10 01:44:11 2009
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 95FDB106566B;
	Thu, 10 Dec 2009 01:44:11 +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 862358FC14;
	Thu, 10 Dec 2009 01:44:11 +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 nBA1iBVg047012;
	Thu, 10 Dec 2009 01:44:11 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBA1iB15047010;
	Thu, 10 Dec 2009 01:44:11 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200912100144.nBA1iB15047010@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 10 Dec 2009 01:44:11 +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: r200343 - projects/mips/sys/mips/include
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: Thu, 10 Dec 2009 01:44:11 -0000

Author: imp
Date: Thu Dec 10 01:44:11 2009
New Revision: 200343
URL: http://svn.freebsd.org/changeset/base/200343

Log:
  Get the sense of this right.  We use uintpr_t for bus_addr_t when
  we're building everything except octeon && 32-bit.  As note before, we
  need a clearner way, but at least now the hack is right.

Modified:
  projects/mips/sys/mips/include/_bus.h

Modified: projects/mips/sys/mips/include/_bus.h
==============================================================================
--- projects/mips/sys/mips/include/_bus.h	Thu Dec 10 01:42:44 2009	(r200342)
+++ projects/mips/sys/mips/include/_bus.h	Thu Dec 10 01:44:11 2009	(r200343)
@@ -35,7 +35,7 @@
  * Bus address and size types
  */
 #include "opt_cputype.h" 
-#if !(defined(TARGET_OCTEON) || defined(ISA_MIPS32))
+#if !(defined(TARGET_OCTEON) && defined(ISA_MIPS32))
 typedef uintptr_t bus_addr_t;
 #else
 typedef uint64_t bus_addr_t;