[src/trunk]: src/sys/arch/powerpc/ibm4xx *** empty log message ***

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

details:   https://anonhg.NetBSD.org/src/rev/70153591cd82
branches:  trunk
changeset: 973077:70153591cd82
user:      rin <rin%NetBSD.org@localhost>
date:      Fri Jun 19 07:14:19 2020 +0000

description:
*** empty log message ***

diffstat:

 sys/arch/powerpc/ibm4xx/pmap.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (39 lines):

diff -r 96e12bf8328e -r 70153591cd82 sys/arch/powerpc/ibm4xx/pmap.c
--- a/sys/arch/powerpc/ibm4xx/pmap.c    Fri Jun 19 02:23:43 2020 +0000
+++ b/sys/arch/powerpc/ibm4xx/pmap.c    Fri Jun 19 07:14:19 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.85 2020/03/05 11:44:54 rin Exp $    */
+/*     $NetBSD: pmap.c,v 1.86 2020/06/19 07:14:19 rin Exp $    */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.85 2020/03/05 11:44:54 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.86 2020/06/19 07:14:19 rin Exp $");
 
 #include <sys/param.h>
 #include <sys/cpu.h>
@@ -1175,9 +1175,8 @@
        }
        __asm volatile(
                "mfmsr %0;"
-               "li %1,0x20;"           /* Turn off IMMU */
+               "li %1, %7;"
                "andc %1,%0,%1;"
-               "ori %1,%1,0x10;"       /* Turn on DMMU for sure */
                "mtmsr %1;"
                "sync;isync;"
                "mfpid %1;"
@@ -1193,7 +1192,8 @@
                "mtmsr %0;"
                "sync; isync"
                : "=&r" (msr), "=&r" (opid)
-               : "r" (ctx), "r" (va), "r" (len), "r" (step), "r" (-step));
+               : "r" (ctx), "r" (va), "r" (len), "r" (step), "r" (-step),
+                 "K" (PSL_IR | PSL_DR));
 }