splimp() -> splvm()
This commit is contained in:
thorpej
parent
a3ec356d52
commit
6f0dfa5049
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: pmap.c,v 1.155 2000/12/21 00:52:01 chs Exp $ */
|
||||
/* $NetBSD: pmap.c,v 1.156 2001/01/14 03:33:34 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
|
||||
@ -154,7 +154,7 @@
|
||||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.155 2000/12/21 00:52:01 chs Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.156 2001/01/14 03:33:34 thorpej Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
@ -448,7 +448,7 @@ struct pmap_tlb_shootdown_q {
|
||||
|
||||
#define PSJQ_LOCK(pq, s) \
|
||||
do { \
|
||||
s = splimp(); \
|
||||
s = splvm(); \
|
||||
simple_lock(&(pq)->pq_slock); \
|
||||
} while (0)
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: pmap.c,v 1.80 2001/01/13 11:31:04 aymeric Exp $ */
|
||||
/* $NetBSD: pmap.c,v 1.81 2001/01/14 03:33:11 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1999 The NetBSD Foundation, Inc.
|
||||
@ -1008,7 +1008,7 @@ pmap_page_protect(pg, prot)
|
||||
/* remove_all */
|
||||
default:
|
||||
pv = pa_to_pvh(pa);
|
||||
s = splimp();
|
||||
s = splvm();
|
||||
while (pv->pv_pmap != NULL) {
|
||||
pt_entry_t *pte;
|
||||
|
||||
@ -1251,7 +1251,7 @@ pmap_enter(pmap, va, pa, prot, flags)
|
||||
enter_stats.managed++;
|
||||
#endif
|
||||
pv = pa_to_pvh(pa);
|
||||
s = splimp();
|
||||
s = splvm();
|
||||
#ifdef DEBUG
|
||||
if (pmapdebug & PDB_ENTER)
|
||||
printf("enter: pv at %p: %lx/%p/%p\n",
|
||||
@ -1597,7 +1597,7 @@ pmap_collect(pmap)
|
||||
printf("pmap_collect(%p)\n", pmap);
|
||||
kpt_stats.collectscans++;
|
||||
#endif
|
||||
s = splimp();
|
||||
s = splvm();
|
||||
|
||||
for (bank = 0; bank < vm_nphysseg; bank++)
|
||||
pmap_collect1(pmap, ptoa(vm_physmem[bank].start),
|
||||
@ -1752,7 +1752,7 @@ pmap_deactivate(p)
|
||||
* machine dependent page at a time.
|
||||
*
|
||||
* Note: WE DO NOT CURRENTLY LOCK THE TEMPORARY ADDRESSES!
|
||||
* (Actually, we go to splimp(), and since we don't
|
||||
* (Actually, we go to splvm(), and since we don't
|
||||
* support multiple processors, this is sufficient.)
|
||||
*/
|
||||
void
|
||||
@ -1777,7 +1777,7 @@ pmap_zero_page(phys)
|
||||
}
|
||||
#endif
|
||||
|
||||
s = splimp();
|
||||
s = splvm();
|
||||
|
||||
*CMAP1 = phys | dst_pte;
|
||||
TBIS((vaddr_t)CADDR1);
|
||||
@ -1803,7 +1803,7 @@ pmap_zero_page(phys)
|
||||
* dependent page at a time.
|
||||
*
|
||||
* Note: WE DO NOT CURRENTLY LOCK THE TEMPORARY ADDRESSES!
|
||||
* (Actually, we go to splimp(), and since we don't
|
||||
* (Actually, we go to splvm(), and since we don't
|
||||
* support multiple processors, this is sufficient.)
|
||||
*/
|
||||
void
|
||||
@ -1829,7 +1829,7 @@ pmap_copy_page(src, dst)
|
||||
}
|
||||
#endif
|
||||
|
||||
s = splimp();
|
||||
s = splvm();
|
||||
*CMAP1 = src | src_pte;
|
||||
TBIS((vaddr_t)CADDR1);
|
||||
*CMAP2 = dst | dst_pte;
|
||||
@ -2086,7 +2086,7 @@ pmap_remove_mapping(pmap, va, pte, flags)
|
||||
*/
|
||||
pv = pa_to_pvh(pa);
|
||||
ste = ST_ENTRY_NULL;
|
||||
s = splimp();
|
||||
s = splvm();
|
||||
/*
|
||||
* If it is the first entry on the list, it is actually
|
||||
* in the header and we must copy the following entry up
|
||||
@ -2295,7 +2295,7 @@ pmap_testbit(pa, bit)
|
||||
return(FALSE);
|
||||
|
||||
pv = pa_to_pvh(pa);
|
||||
s = splimp();
|
||||
s = splvm();
|
||||
/*
|
||||
* Check saved info first
|
||||
*/
|
||||
@ -2343,7 +2343,7 @@ pmap_changebit(pa, bit, setem)
|
||||
return;
|
||||
|
||||
pv = pa_to_pvh(pa);
|
||||
s = splimp();
|
||||
s = splvm();
|
||||
/*
|
||||
* Clear saved attributes (modify, reference)
|
||||
*/
|
||||
@ -2508,7 +2508,7 @@ pmap_enter_ptpage(pmap, va)
|
||||
if (pmap == pmap_kernel()) {
|
||||
struct kpt_page *kpt;
|
||||
|
||||
s = splimp();
|
||||
s = splvm();
|
||||
if ((kpt = kpt_free_list) == (struct kpt_page *)0) {
|
||||
/*
|
||||
* No PT pages available.
|
||||
@ -2599,7 +2599,7 @@ pmap_enter_ptpage(pmap, va)
|
||||
* the STE when we remove the mapping for the page.
|
||||
*/
|
||||
pv = pa_to_pvh(ptpa);
|
||||
s = splimp();
|
||||
s = splvm();
|
||||
if (pv) {
|
||||
pv->pv_flags |= PV_PTPAGE;
|
||||
do {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: pmap.c,v 1.15 2000/12/31 16:09:34 bjh21 Exp $ */
|
||||
/* $NetBSD: pmap.c,v 1.16 2001/01/14 03:32:20 thorpej Exp $ */
|
||||
/*-
|
||||
* Copyright (c) 1997, 1998, 2000 Ben Harris
|
||||
* All rights reserved.
|
||||
@ -105,7 +105,7 @@
|
||||
|
||||
#include <sys/param.h>
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.15 2000/12/31 16:09:34 bjh21 Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.16 2001/01/14 03:32:20 thorpej Exp $");
|
||||
|
||||
#include <sys/kernel.h> /* for cold */
|
||||
#include <sys/malloc.h>
|
||||
@ -609,7 +609,7 @@ pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags)
|
||||
|
||||
UVMHIST_LOG(pmaphist, "mapping ppn %d at lpn %d in pmap %p",
|
||||
ppn, lpn, pmap, 0);
|
||||
s = splimp();
|
||||
s = splvm();
|
||||
|
||||
/* Remove any existing mapping at this lpn */
|
||||
if (pmap->pm_entries[lpn] != NULL &&
|
||||
@ -653,7 +653,7 @@ pmap_remove(pmap_t pmap, vaddr_t sva, vaddr_t eva)
|
||||
slpn = atop(sva); elpn = atop(eva);
|
||||
UVMHIST_LOG(pmaphist, "clearing from lpn %d to lpn %d in pmap %p",
|
||||
slpn, elpn - 1, pmap, 0);
|
||||
s = splimp();
|
||||
s = splvm();
|
||||
for (lpn = slpn; lpn < elpn; lpn++) {
|
||||
pv = pmap->pm_entries[lpn];
|
||||
if (pv != NULL) {
|
||||
@ -910,7 +910,7 @@ pmap_protect(pmap_t pmap, vaddr_t sva, vaddr_t eva, vm_prot_t prot)
|
||||
return; /* can't restrict kernel w/o unmapping. */
|
||||
|
||||
slpn = atop(sva); elpn = atop(eva);
|
||||
s = splimp();
|
||||
s = splvm();
|
||||
for (lpn = slpn; lpn < elpn; lpn++) {
|
||||
pv = pmap->pm_entries[lpn];
|
||||
if (pv != NULL) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user