Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/arch/sparc/sparc/pmap.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/sparc/sparc/pmap.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.152.2.1 retrieving revision 1.152.2.2 diff -u -p -r1.152.2.1 -r1.152.2.2 --- src/sys/arch/sparc/sparc/pmap.c 2000/11/20 20:25:46 1.152.2.1 +++ src/sys/arch/sparc/sparc/pmap.c 2001/01/18 09:23:02 1.152.2.2 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.152.2.1 2000/11/20 20:25:46 bouyer Exp $ */ +/* $NetBSD: pmap.c,v 1.152.2.2 2001/01/18 09:23:02 bouyer Exp $ */ /* * Copyright (c) 1996 @@ -154,10 +154,6 @@ struct pmap_stats { int pmapdebug = 0; #endif -#if 0 -#define splpmap() splimp() -#endif - /* * First and last managed physical addresses. */ @@ -1599,7 +1595,7 @@ mmu_pagein(pm, va, prot) unsigned int tva = VA_ROUNDDOWNTOREG(va); struct segmap *sp = rp->rg_segmap; - s = splpmap(); /* paranoid */ + s = splvm(); /* paranoid */ smeg = region_alloc(®ion_lru, pm, vr)->me_cookie; setregmap(tva, smeg); i = NSEGRG; @@ -1622,7 +1618,7 @@ mmu_pagein(pm, va, prot) /* reload segment: write PTEs into a new LRU entry */ va = VA_ROUNDDOWNTOSEG(va); - s = splpmap(); /* paranoid */ + s = splvm(); /* paranoid */ pmeg = me_alloc(&segm_lru, pm, vr, vs)->me_cookie; setsegmap(va, pmeg); i = NPTESG; @@ -1664,7 +1660,7 @@ ctx_alloc(pm) gap_end = pm->pm_gap_end; } - s = splpmap(); + s = splvm(); if ((c = ctx_freelist) != NULL) { ctx_freelist = c->c_nextfree; cnum = c - cpuinfo.ctxinfo; @@ -1911,7 +1907,7 @@ pv_changepte4_4c(pv0, bis, bic) write_user_windows(); /* paranoid? */ - s = splpmap(); /* paranoid? */ + s = splvm(); /* paranoid? */ if (pv0->pv_pmap == NULL) { splx(s); return; @@ -2008,7 +2004,7 @@ pv_syncflags4_4c(pv0) write_user_windows(); /* paranoid? */ - s = splpmap(); /* paranoid? */ + s = splvm(); /* paranoid? */ if (pv0->pv_pmap == NULL) { /* paranoid */ splx(s); return (0); @@ -2234,7 +2230,7 @@ pv_changepte4m(pv0, bis, bic) write_user_windows(); /* paranoid? */ - s = splpmap(); /* paranoid? */ + s = splvm(); /* paranoid? */ if (pv0->pv_pmap == NULL) { splx(s); return; @@ -2318,7 +2314,7 @@ pv_syncflags4m(pv0) write_user_windows(); /* paranoid? */ - s = splpmap(); /* paranoid? */ + s = splvm(); /* paranoid? */ if (pv0->pv_pmap == NULL) { /* paranoid */ splx(s); return (0); @@ -2524,7 +2520,7 @@ pv_flushcache(pv) write_user_windows(); /* paranoia? */ - s = splpmap(); /* XXX extreme paranoia */ + s = splvm(); /* XXX extreme paranoia */ if ((pm = pv->pv_pmap) != NULL) { ctx = getcontext(); for (;;) { @@ -3748,7 +3744,7 @@ pmap_release(pm) struct pmap *pm; { union ctxinfo *c; - int s = splpmap(); /* paranoia */ + int s = splvm(); /* paranoia */ #ifdef DEBUG if (pmapdebug & PDB_DESTROY) @@ -3876,7 +3872,7 @@ pmap_remove(pm, va, endva) } ctx = getcontext(); - s = splpmap(); /* XXX conservative */ + s = splvm(); /* XXX conservative */ simple_lock(&pm->pm_lock); for (; va < endva; va = nva) { /* do one virtual segment at a time */ @@ -4462,7 +4458,7 @@ pmap_page_protect4_4c(pg, prot) * The logic is much like that for pmap_remove, * but we know we are removing exactly one page. */ - s = splpmap(); + s = splvm(); if (pv->pv_pmap == NULL) { splx(s); return; @@ -4636,7 +4632,7 @@ pmap_protect4_4c(pm, sva, eva, prot) write_user_windows(); ctx = getcontext4(); - s = splpmap(); + s = splvm(); simple_lock(&pm->pm_lock); for (va = sva; va < eva;) { @@ -4745,7 +4741,7 @@ pmap_changeprot4_4c(pm, va, prot, wired) newprot = prot & VM_PROT_WRITE ? PG_W : 0; vr = VA_VREG(va); vs = VA_VSEG(va); - s = splpmap(); /* conservative */ + s = splvm(); /* conservative */ rp = &pm->pm_regmap[vr]; if (rp->rg_nsegmap == 0) { printf("pmap_changeprot: no segments in %d\n", vr); @@ -4864,7 +4860,7 @@ pmap_page_protect4m(pg, prot) * The logic is much like that for pmap_remove, * but we know we are removing exactly one page. */ - s = splpmap(); + s = splvm(); if (pv->pv_pmap == NULL) { splx(s); return; @@ -4988,7 +4984,7 @@ pmap_protect4m(pm, sva, eva, prot) write_user_windows(); ctx = getcontext4m(); - s = splpmap(); + s = splvm(); simple_lock(&pm->pm_lock); for (va = sva; va < eva;) { @@ -5083,7 +5079,7 @@ pmap_changeprot4m(pm, va, prot, wired) pmap_stats.ps_changeprots++; - s = splpmap(); /* conservative */ + s = splvm(); /* conservative */ rp = &pm->pm_regmap[VA_VREG(va)]; sp = &rp->rg_segmap[VA_VSEG(va)]; @@ -5211,7 +5207,7 @@ pmap_enk4_4c(pm, va, prot, wired, pv, pt vs = VA_VSEG(va); rp = &pm->pm_regmap[vr]; sp = &rp->rg_segmap[vs]; - s = splpmap(); /* XXX way too conservative */ + s = splvm(); /* XXX way too conservative */ #if defined(SUN4_MMU3L) if (HASSUN4_MMU3L && rp->rg_smeg == reginval) { @@ -5335,7 +5331,7 @@ pmap_enu4_4c(pm, va, prot, wired, pv, pt vr = VA_VREG(va); vs = VA_VSEG(va); rp = &pm->pm_regmap[vr]; - s = splpmap(); /* XXX conservative */ + s = splvm(); /* XXX conservative */ /* * If there is no space in which the PTEs can be written @@ -5630,7 +5626,7 @@ pmap_enk4m(pm, va, prot, wired, pv, ptep rp = &pm->pm_regmap[vr]; sp = &rp->rg_segmap[vs]; - s = splpmap(); /* XXX way too conservative */ + s = splvm(); /* XXX way too conservative */ if (rp->rg_seg_ptps == NULL) /* enter new region */ panic("pmap_enk4m: missing kernel region table for va 0x%lx",va); @@ -5713,7 +5709,7 @@ pmap_enu4m(pm, va, prot, wired, pv, ptep vr = VA_VREG(va); vs = VA_VSEG(va); rp = &pm->pm_regmap[vr]; - s = splpmap(); /* XXX conservative */ + s = splvm(); /* XXX conservative */ rretry: if (rp->rg_segmap == NULL) { @@ -6786,7 +6782,7 @@ pmap_activate(p) * the new context. */ - s = splpmap(); + s = splvm(); if (p == curproc) { write_user_windows(); if (pmap->pm_ctx == NULL) { @@ -7124,7 +7120,7 @@ pmap_writetext(dst, ch) int s, pte0, pte, ctx; vaddr_t va; - s = splpmap(); + s = splvm(); va = (unsigned long)dst & (~PGOFSET); cpuinfo.cache_flush(dst, 1);