Module Name: src
Committed By: skrll
Date: Fri Jun 9 06:39:24 UTC 2017
Modified Files:
src/sys/arch/mips/mips: pmap_machdep.c
Log Message:
Always use XKPHYS for pool pages on _LP64; otherwise use KSEG0
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/mips/mips/pmap_machdep.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_machdep.c
diff -u src/sys/arch/mips/mips/pmap_machdep.c:1.20 src/sys/arch/mips/mips/pmap_machdep.c:1.21
--- src/sys/arch/mips/mips/pmap_machdep.c:1.20 Mon Jun 5 10:45:36 2017
+++ src/sys/arch/mips/mips/pmap_machdep.c Fri Jun 9 06:39:24 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_machdep.c,v 1.20 2017/06/05 10:45:36 skrll Exp $ */
+/* $NetBSD: pmap_machdep.c,v 1.21 2017/06/09 06:39:24 skrll Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_machdep.c,v 1.20 2017/06/05 10:45:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_machdep.c,v 1.21 2017/06/09 06:39:24 skrll Exp $");
/*
* Manages physical address maps.
@@ -1065,12 +1065,10 @@ vaddr_t
pmap_md_pool_phystov(paddr_t pa)
{
#ifdef _LP64
- if ((pa & ~MIPS_PHYS_MASK) != 0) {
- KASSERT(mips_options.mips3_xkphys_cached);
- return MIPS_PHYS_TO_XKPHYS_CACHED(pa);
- }
+ KASSERT(mips_options.mips3_xkphys_cached);
+ return MIPS_PHYS_TO_XKPHYS_CACHED(pa);
#else
KASSERT((pa & ~MIPS_PHYS_MASK) == 0);
-#endif
return MIPS_PHYS_TO_KSEG0(pa);
+#endif
}
