[src/trunk]: src/sys/arch/mips/mips Always use XKPHYS for pool pages on _LP64...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/19ce850087e1
branches:  trunk
changeset: 824574:19ce850087e1
user:      skrll <skrll%NetBSD.org@localhost>
date:      Fri Jun 09 06:39:24 2017 +0000

description:
Always use XKPHYS for pool pages on _LP64; otherwise use KSEG0

diffstat:

 sys/arch/mips/mips/pmap_machdep.c |  12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diffs (34 lines):

diff -r debbba32f426 -r 19ce850087e1 sys/arch/mips/mips/pmap_machdep.c
--- a/sys/arch/mips/mips/pmap_machdep.c Fri Jun 09 06:09:01 2017 +0000
+++ b/sys/arch/mips/mips/pmap_machdep.c Fri Jun 09 06:39:24 2017 +0000
@@ -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 @@
 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);
+       return MIPS_PHYS_TO_KSEG0(pa);
 #endif
-       return MIPS_PHYS_TO_KSEG0(pa);
 }