From owner-svn-src-user@FreeBSD.ORG  Wed Apr 14 01:43:25 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C6C81106566C;
	Wed, 14 Apr 2010 01:43:25 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B6FBA8FC14;
	Wed, 14 Apr 2010 01:43:25 +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 o3E1hPUh027013;
	Wed, 14 Apr 2010 01:43:25 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3E1hPDr027011;
	Wed, 14 Apr 2010 01:43:25 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201004140143.o3E1hPDr027011@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Wed, 14 Apr 2010 01:43:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206583 - user/jmallett/octeon/sys/mips/mips
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Apr 2010 01:43:25 -0000

Author: jmallett
Date: Wed Apr 14 01:43:25 2010
New Revision: 206583
URL: http://svn.freebsd.org/changeset/base/206583

Log:
  Fix N64 build.

Modified:
  user/jmallett/octeon/sys/mips/mips/mem.c

Modified: user/jmallett/octeon/sys/mips/mips/mem.c
==============================================================================
--- user/jmallett/octeon/sys/mips/mips/mem.c	Wed Apr 14 01:29:31 2010	(r206582)
+++ user/jmallett/octeon/sys/mips/mips/mem.c	Wed Apr 14 01:43:25 2010	(r206583)
@@ -67,8 +67,10 @@ __FBSDID("$FreeBSD$");
 #include <machine/atomic.h>
 #include <machine/memdev.h>
 
-
+#if !defined(__mips_n64)
 extern struct sysmaps sysmaps_pcpu[];
+#endif
+
 /*ARGSUSED*/
 int
 memrw(dev, uio, flags)
@@ -116,7 +118,7 @@ memrw(dev, uio, flags)
 #if !defined(__mips_n64)
 				va = pmap_map_fpage(pa, fp, FALSE);
 #else
-				va = MIPS_PHYS_TO_XKPHYS(XKPHYS_CCA, pa);
+				va = MIPS_PHYS_TO_XKPHYS(MIPS_XKPHYS_CCA_CNC, pa);
 #endif
 				o = (int)uio->uio_offset & PAGE_MASK;
 				c = (u_int)(PAGE_SIZE -