Module Name: src
Committed By: matt
Date: Mon Sep 7 22:19:53 UTC 2009
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: pmap.c
Log Message:
Fix MIPS_PHYS_TO_XKPHYS calls.
To generate a diff of this commit:
cvs rdiff -u -r1.179.16.3 -r1.179.16.4 src/sys/arch/mips/mips/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/pmap.c
diff -u src/sys/arch/mips/mips/pmap.c:1.179.16.3 src/sys/arch/mips/mips/pmap.c:1.179.16.4
--- src/sys/arch/mips/mips/pmap.c:1.179.16.3 Mon Sep 7 22:08:31 2009
+++ src/sys/arch/mips/mips/pmap.c Mon Sep 7 22:19:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.179.16.3 2009/09/07 22:08:31 matt Exp $ */
+/* $NetBSD: pmap.c,v 1.179.16.4 2009/09/07 22:19:53 matt Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.179.16.3 2009/09/07 22:08:31 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.179.16.4 2009/09/07 22:19:53 matt Exp $");
/*
* Manages physical address maps.
@@ -483,7 +483,7 @@
else
#ifdef _LP64
va = MIPS_PHYS_TO_XKPHYS(
- MIPS3_PG_TO_CCA(mips3_pg_cached), pa);
+ MIPS3_PG_TO_CCA(MIPS3_PG_CACHED), pa);
#else
panic("pmap_steal_memory: "
"pa can not be mapped into K0");
@@ -613,7 +613,7 @@
#ifdef _LP64
if (stp_pa > MIPS_PHYS_MASK)
stp = (struct segtab *)MIPS_PHYS_TO_XKPHYS(
- stp_pa, MIPS3_PG_TO_CCA(mips3_pg_cached));
+ MIPS3_PG_TO_CCA(MIPS3_PG_CACHED), stp_pa);
else
#endif
stp = (struct segtab *)MIPS_PHYS_TO_KSEG0(stp_pa);
@@ -1315,8 +1315,8 @@
phys = VM_PAGE_TO_PHYS(mem);
#ifdef _LP64
if ((vaddr_t)pte > MIPS_PHYS_MASK)
- pte = (pt_entry_t *)MIPS_PHYS_TO_XKPHYS(phys,
- MIPS3_PG_TO_CCA(mips3_pg_cached));
+ pte = (pt_entry_t *)MIPS_PHYS_TO_XKPHYS(
+ MIPS3_PG_TO_CCA(MIPS3_PG_CACHED), phys);
else
#endif
pte = (pt_entry_t *)MIPS_PHYS_TO_KSEG0(phys);
@@ -1660,7 +1660,7 @@
#endif
#ifdef _LP64
if (phys > MIPS_PHYS_MASK)
- va = MIPS_PHYS_TO_XKPHYS(phys, MIPS3_PG_TO_CCA(mips3_pg_cached));
+ va = MIPS_PHYS_TO_XKPHYS(MIPS3_PG_TO_CCA(MIPS3_PG_CACHED), phys);
else
#endif
va = MIPS_PHYS_TO_KSEG0(phys);
@@ -1705,13 +1705,13 @@
#endif
#ifdef _LP64
if (src > MIPS_PHYS_MASK)
- src_va = MIPS_PHYS_TO_XKPHYS(src, MIPS3_PG_TO_CCA(mips3_pg_cached));
+ src_va = MIPS_PHYS_TO_XKPHYS(MIPS3_PG_TO_CCA(MIPS3_PG_CACHED), src);
else
#endif
src_va = MIPS_PHYS_TO_KSEG0(src);
#ifdef _LP64
if (dst > MIPS_PHYS_MASK)
- dst_va = MIPS_PHYS_TO_XKPHYS(dst, MIPS3_PG_TO_CCA(mips3_pg_cached));
+ dst_va = MIPS_PHYS_TO_XKPHYS(MIPS3_PG_TO_CCA(MIPS3_PG_CACHED), dst);
else
#endif
dst_va = MIPS_PHYS_TO_KSEG0(dst);
@@ -2189,7 +2189,7 @@
phys = VM_PAGE_TO_PHYS(pg);
#ifdef _LP64
if (phys > MIPS_PHYS_MASK)
- va = MIPS_PHYS_TO_XKPHYS(phys, MIPS3_PG_TO_CCA(mips3_pg_cached));
+ va = MIPS_PHYS_TO_XKPHYS(MIPS3_PG_TO_CCA(MIPS3_PG_CACHED), phys);
else
#endif
va = MIPS_PHYS_TO_KSEG0(phys);
@@ -2276,7 +2276,7 @@
va = MIPS_PHYS_TO_KSEG0(pa);
else
#ifdef _LP64
- va = MIPS_PHYS_TO_XKPHYS(MIPS3_PG_TO_CCA(mips3_pg_cached), pa);
+ va = MIPS_PHYS_TO_XKPHYS(MIPS3_PG_TO_CCA(MIPS3_PG_CACHED), pa);
#else
panic("mips_pmap_map_poolpage: "
"pa #%"PRIxPADDR" can not be mapped into KSEG0", pa);
