Oops; forgot to change some pmap_enter() calls.

This commit is contained in:
mycroft 1999-03-27 03:34:08 +00:00
parent ef619b1714
commit 9affa543a5
7 changed files with 34 additions and 23 deletions

View File

@ -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 @@ pmap_enter_ptpage(pmap, va)
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);

View File

@ -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 @@ pmap_map(virt, start, end, prot)
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 @@ pmap_enter_ptpage(pmap, va)
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);

View File

@ -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 @@ pmap_enter_ptpage(pmap, va)
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);

View File

@ -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 @@ pmap_zero_page(phys)
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 @@ pmap_copy_page(src, dst)
#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 @@ pmap_enter_ptpage(pmap, va)
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);

View File

@ -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 @@ pmap_enter_ptpage(pmap, va)
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);

View File

@ -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 @@ pmap_zero_page(phys)
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 @@ pmap_copy_page(src, dst)
#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 @@ pmap_enter_ptpage(pmap, va)
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);

View File

@ -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 @@ pmap_enter_ptpage(pmap, va)
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);