From owner-svn-src-projects@FreeBSD.ORG  Fri Nov 20 15:59:42 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 500321065672;
	Fri, 20 Nov 2009 15:59:42 +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 3F7EE8FC29;
	Fri, 20 Nov 2009 15:59:42 +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 nAKFxfWi048997;
	Fri, 20 Nov 2009 15:59:41 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAKFxfV7048995;
	Fri, 20 Nov 2009 15:59:41 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200911201559.nAKFxfV7048995@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 20 Nov 2009 15:59:41 +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: r199594 - projects/mips/sys/mips/octeon1
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: Fri, 20 Nov 2009 15:59:42 -0000

Author: imp
Date: Fri Nov 20 15:59:41 2009
New Revision: 199594
URL: http://svn.freebsd.org/changeset/base/199594

Log:
  If we're ompiling ISA_MIPS32, then use the 32-bit address-size
  definitions.

Modified:
  projects/mips/sys/mips/octeon1/octeon_pcmap_regs.h

Modified: projects/mips/sys/mips/octeon1/octeon_pcmap_regs.h
==============================================================================
--- projects/mips/sys/mips/octeon1/octeon_pcmap_regs.h	Fri Nov 20 15:57:45 2009	(r199593)
+++ projects/mips/sys/mips/octeon1/octeon_pcmap_regs.h	Fri Nov 20 15:59:41 2009	(r199594)
@@ -6,6 +6,7 @@
 #ifndef __OCTEON_PCMAP_REGS_H__
 #define __OCTEON_PCMAP_REGS_H__
 
+#include "opt_cputype.h" 
 
 #define OCTEON_CACHE_LINE_SIZE	0x80	/* 128 bytes cache line size */
 #define IS_OCTEON_ALIGNED(p)	(!((u_long)(p) & 0x7f))
@@ -549,7 +550,7 @@ typedef enum {
 
 /*  PTR_SIZE == sizeof(uint32_t)  */
 
-#if 0
+#ifdef ISA_MIPS32
 #define mipsx_addr_size				uint32_t	// u_int64
 #define MIPSX_ADDR_SIZE_KSEGX_BIT_SHIFT		30		// 62
 #define MIPSX_ADDR_SIZE_KSEGX_MASK_REMOVED	0x1fffffff	// 0x1fffffff