[src/trunk]: src/sys/arch Oops; forgot to change some pmap_enter() calls.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch Oops; forgot to change some pmap_enter() calls.
From: mycroft <mycroft%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 05:30:42 +0000
details:   https://anonhg.NetBSD.org/src/rev/d43eb0103040
branches:  trunk
changeset: 467672:d43eb0103040
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Sat Mar 27 03:34:08 1999 +0000

description:
Oops; forgot to change some pmap_enter() calls.

diffstat:

 sys/arch/amiga/amiga/pmap.c     |   5 +++--
 sys/arch/atari/atari/pmap.c     |   7 ++++---
 sys/arch/hp300/hp300/pmap.c     |   5 +++--
 sys/arch/mac68k/mac68k/pmap.c   |  15 +++++++++------
 sys/arch/mvme68k/mvme68k/pmap.c |   5 +++--
 sys/arch/next68k/next68k/pmap.c |  15 +++++++++------
 sys/arch/x68k/x68k/pmap.c       |   5 +++--
 7 files changed, 34 insertions(+), 23 deletions(-)

diffs (194 lines):

diff -r 289b670af614 -r d43eb0103040 sys/arch/amiga/amiga/pmap.c
--- a/sys/arch/amiga/amiga/pmap.c       Sat Mar 27 03:27:09 1999 +0000
+++ b/sys/arch/amiga/amiga/pmap.c       Sat Mar 27 03:34:08 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.61 1999/03/26 23:41:27 mycroft Exp $        */
+/*     $NetBSD: pmap.c,v 1.62 1999/03/27 03:37:51 mycroft Exp $        */
 
 /* 
  * Copyright (c) 1991 Regents of the University of California.
@@ -2435,7 +2435,8 @@
                kpt_used_list = kpt;
                ptpa = kpt->kpt_pa;
                bzero((char *)kpt->kpt_va, NBPG);
-               pmap_enter(pmap, va, ptpa, VM_PROT_DEFAULT, TRUE);
+               pmap_enter(pmap, va, ptpa, VM_PROT_DEFAULT, TRUE,
+                   VM_PROT_DEFAULT);
 #if defined(M68060)
                if (cputype == CPU_68060) {
                        pmap_changebit(ptpa, PG_CCB, 0);
diff -r 289b670af614 -r d43eb0103040 sys/arch/atari/atari/pmap.c
--- a/sys/arch/atari/atari/pmap.c       Sat Mar 27 03:27:09 1999 +0000
+++ b/sys/arch/atari/atari/pmap.c       Sat Mar 27 03:34:08 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.42 1999/03/26 23:41:28 mycroft Exp $        */
+/*     $NetBSD: pmap.c,v 1.43 1999/03/27 03:37:51 mycroft Exp $        */
 
 /* 
  * Copyright (c) 1991 Regents of the University of California.
@@ -700,7 +700,7 @@
                printf("pmap_map(%lx, %lx, %lx, %x)\n", virt, start, end, prot);
 #endif
        while (start < end) {
-               pmap_enter(pmap_kernel(), virt, start, prot, FALSE);
+               pmap_enter(pmap_kernel(), virt, start, prot, FALSE, 0);
                virt += PAGE_SIZE;
                start += PAGE_SIZE;
        }
@@ -2317,7 +2317,8 @@
                kpt_used_list = kpt;
                ptpa = kpt->kpt_pa;
                bzero((char *)kpt->kpt_va, NBPG);
-               pmap_enter(pmap, va, ptpa, VM_PROT_DEFAULT, TRUE);
+               pmap_enter(pmap, va, ptpa, VM_PROT_DEFAULT, TRUE,
+                   VM_PROT_DEFAULT);
 #if defined(M68060)
                if (cputype == CPU_68060) {
                        pmap_changebit(ptpa, PG_CCB, 0);
diff -r 289b670af614 -r d43eb0103040 sys/arch/hp300/hp300/pmap.c
--- a/sys/arch/hp300/hp300/pmap.c       Sat Mar 27 03:27:09 1999 +0000
+++ b/sys/arch/hp300/hp300/pmap.c       Sat Mar 27 03:34:08 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.68 1999/03/26 23:41:29 mycroft Exp $        */
+/*     $NetBSD: pmap.c,v 1.69 1999/03/27 03:37:52 mycroft Exp $        */
 
 /* 
  * Copyright (c) 1991, 1993
@@ -2499,7 +2499,8 @@
                kpt_used_list = kpt;
                ptpa = kpt->kpt_pa;
                bzero((caddr_t)kpt->kpt_va, NBPG);
-               pmap_enter(pmap, va, ptpa, VM_PROT_DEFAULT, TRUE);
+               pmap_enter(pmap, va, ptpa, VM_PROT_DEFAULT, TRUE,
+                   VM_PROT_DEFAULT);
 #ifdef DEBUG
                if (pmapdebug & (PDB_ENTER|PDB_PTPAGE)) {
                        int ix = pmap_ste(pmap, va) - pmap_ste(pmap, 0);
diff -r 289b670af614 -r d43eb0103040 sys/arch/mac68k/mac68k/pmap.c
--- a/sys/arch/mac68k/mac68k/pmap.c     Sat Mar 27 03:27:09 1999 +0000
+++ b/sys/arch/mac68k/mac68k/pmap.c     Sat Mar 27 03:34:08 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.50 1999/03/26 23:41:30 mycroft Exp $        */
+/*     $NetBSD: pmap.c,v 1.51 1999/03/27 03:37:52 mycroft Exp $        */
 
 /* 
  * Copyright (c) 1991, 1993
@@ -1618,10 +1618,11 @@
                printf("pmap_zero_page(%lx)\n", phys);
 #endif
        kva = (vaddr_t)CADDR1;
-       pmap_enter(pmap_kernel(), kva, phys, VM_PROT_READ|VM_PROT_WRITE, TRUE);
+       pmap_enter(pmap_kernel(), kva, phys, VM_PROT_READ|VM_PROT_WRITE, TRUE,
+           VM_PROT_READ|VM_PROT_WRITE);
        zeropage((caddr_t)kva);
        pmap_remove_mapping(pmap_kernel(), kva, PT_ENTRY_NULL,
-                           PRM_TFLUSH|PRM_CFLUSH);
+           PRM_TFLUSH|PRM_CFLUSH);
 }
 
 /*
@@ -1643,8 +1644,9 @@
 #endif
        skva = (vaddr_t)CADDR1;
        dkva = (vaddr_t)CADDR2;
-       pmap_enter(pmap_kernel(), skva, src, VM_PROT_READ, TRUE);
-       pmap_enter(pmap_kernel(), dkva, dst, VM_PROT_READ|VM_PROT_WRITE, TRUE);
+       pmap_enter(pmap_kernel(), skva, src, VM_PROT_READ, TRUE, VM_PROT_READ);
+       pmap_enter(pmap_kernel(), dkva, dst, VM_PROT_READ|VM_PROT_WRITE, TRUE,
+           VM_PROT_READ|VM_PROT_WRITE);
        copypage((caddr_t)skva, (caddr_t)dkva);
        /* CADDR1 and CADDR2 are virtually contiguous */
        pmap_remove(pmap_kernel(), skva, skva + (2 * NBPG));
@@ -2289,7 +2291,8 @@
                kpt_used_list = kpt;
                ptpa = kpt->kpt_pa;
                bzero((caddr_t)kpt->kpt_va, NBPG);
-               pmap_enter(pmap, va, ptpa, VM_PROT_DEFAULT, TRUE);
+               pmap_enter(pmap, va, ptpa, VM_PROT_DEFAULT, TRUE,
+                   VM_PROT_DEFAULT);
 #ifdef DEBUG
                if (pmapdebug & (PDB_ENTER|PDB_PTPAGE)) {
                        int ix = pmap_ste(pmap, va) - pmap_ste(pmap, 0);
diff -r 289b670af614 -r d43eb0103040 sys/arch/mvme68k/mvme68k/pmap.c
--- a/sys/arch/mvme68k/mvme68k/pmap.c   Sat Mar 27 03:27:09 1999 +0000
+++ b/sys/arch/mvme68k/mvme68k/pmap.c   Sat Mar 27 03:34:08 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.28 1999/03/26 23:41:31 mycroft Exp $        */
+/*     $NetBSD: pmap.c,v 1.29 1999/03/27 03:37:52 mycroft Exp $        */
 
 /* 
  * Copyright (c) 1991, 1993
@@ -2260,7 +2260,8 @@
                kpt_used_list = kpt;
                ptpa = kpt->kpt_pa;
                bzero((caddr_t)kpt->kpt_va, NBPG);
-               pmap_enter(pmap, va, ptpa, VM_PROT_DEFAULT, TRUE);
+               pmap_enter(pmap, va, ptpa, VM_PROT_DEFAULT, TRUE,
+                   VM_PROT_DEFAULT);
 #ifdef DEBUG
                if (pmapdebug & (PDB_ENTER|PDB_PTPAGE)) {
                        int ix = pmap_ste(pmap, va) - pmap_ste(pmap, 0);
diff -r 289b670af614 -r d43eb0103040 sys/arch/next68k/next68k/pmap.c
--- a/sys/arch/next68k/next68k/pmap.c   Sat Mar 27 03:27:09 1999 +0000
+++ b/sys/arch/next68k/next68k/pmap.c   Sat Mar 27 03:34:08 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.10 1999/03/26 23:41:32 mycroft Exp $        */
+/*     $NetBSD: pmap.c,v 1.11 1999/03/27 03:34:08 mycroft Exp $        */
 
 /*
  * This file was taken from mvme68k/mvme68k/pmap.c
@@ -1793,10 +1793,11 @@
                printf("pmap_zero_page(%lx)\n", phys);
 #endif
        kva = (vaddr_t) CADDR1;
-       pmap_enter(pmap_kernel(), kva, phys, VM_PROT_READ|VM_PROT_WRITE, TRUE);
+       pmap_enter(pmap_kernel(), kva, phys, VM_PROT_READ|VM_PROT_WRITE, TRUE,
+           VM_PROT_READ|VM_PROT_WRITE);
        zeropage((caddr_t)kva);
        pmap_remove_mapping(pmap_kernel(), kva, PT_ENTRY_NULL,
-                           PRM_TFLUSH|PRM_CFLUSH);
+           PRM_TFLUSH|PRM_CFLUSH);
 }
 
 /*
@@ -1825,8 +1826,9 @@
 #endif
        skva = (vaddr_t) CADDR1;
        dkva = (vaddr_t) CADDR2;
-       pmap_enter(pmap_kernel(), skva, src, VM_PROT_READ, TRUE);
-       pmap_enter(pmap_kernel(), dkva, dst, VM_PROT_READ|VM_PROT_WRITE, TRUE);
+       pmap_enter(pmap_kernel(), skva, src, VM_PROT_READ, TRUE, VM_PROT_READ);
+       pmap_enter(pmap_kernel(), dkva, dst, VM_PROT_READ|VM_PROT_WRITE, TRUE,
+           VM_PROT_READ|VM_PROT_WRITE);
        copypage((caddr_t)skva, (caddr_t)dkva);
        /* CADDR1 and CADDR2 are virtually contiguous */
        pmap_remove(pmap_kernel(), skva, skva + (2 * NBPG));
@@ -2578,7 +2580,8 @@
                kpt_used_list = kpt;
                ptpa = kpt->kpt_pa;
                bzero((caddr_t)kpt->kpt_va, NBPG);
-               pmap_enter(pmap, va, ptpa, VM_PROT_DEFAULT, TRUE);
+               pmap_enter(pmap, va, ptpa, VM_PROT_DEFAULT, TRUE,
+                   VM_PROT_DEFAULT);
 #ifdef DEBUG
                if (pmapdebug & (PDB_ENTER|PDB_PTPAGE)) {
                        int ix = pmap_ste(pmap, va) - pmap_ste(pmap, 0);
diff -r 289b670af614 -r d43eb0103040 sys/arch/x68k/x68k/pmap.c
--- a/sys/arch/x68k/x68k/pmap.c Sat Mar 27 03:27:09 1999 +0000
+++ b/sys/arch/x68k/x68k/pmap.c Sat Mar 27 03:34:08 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.29 1999/03/26 23:41:38 mycroft Exp $        */
+/*     $NetBSD: pmap.c,v 1.30 1999/03/27 03:37:53 mycroft Exp $        */
 
 /* 
  * Copyright (c) 1991, 1993
@@ -2469,7 +2469,8 @@
                kpt_used_list = kpt;
                ptpa = kpt->kpt_pa;
                bzero((caddr_t)kpt->kpt_va, NBPG);
-               pmap_enter(pmap, va, ptpa, VM_PROT_DEFAULT, TRUE);
+               pmap_enter(pmap, va, ptpa, VM_PROT_DEFAULT, TRUE,
+                   VM_PROT_DEFAULT);
 #ifdef DEBUG
                if (pmapdebug & (PDB_ENTER|PDB_PTPAGE)) {
                        int ix = pmap_ste(pmap, va) - pmap_ste(pmap, 0);
Prev by Date: [src/trunk]: src/sys/arch/pmax/pmax The ECC handling was broken when the comm...
Next by Date: [src/trunk]: src/etc If we have an 'operator' user, it should at least be gid...
Previous by Thread: [src/trunk]: src/sys/arch/pmax/pmax The ECC handling was broken when the comm...
Next by Thread: [src/trunk]: src/etc If we have an 'operator' user, it should at least be gid...
Indexes:
Home | Main Index | Thread Index | Old Index