svn commit: r206583 - user/jmallett/octeon/sys/mips/mips

Juli Mallett jmallett at FreeBSD.org
Wed Apr 14 01:43:25 UTC 2010


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 -


More information about the svn-src-user mailing list