[src/netbsd-1-4]: src/sys/arch/sparc/sparc pullup 1.147->1.148 (pk)

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

details:   https://anonhg.NetBSD.org/src/rev/7fddff27ce2c
branches:  netbsd-1-4
changeset: 469161:7fddff27ce2c
user:      perry <perry%NetBSD.org@localhost>
date:      Fri Jul 02 17:03:10 1999 +0000

description:
pullup 1.147->1.148 (pk)

diffstat:

 sys/arch/sparc/sparc/pmap.c |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (36 lines):

diff -r 5de2a8938794 -r 7fddff27ce2c sys/arch/sparc/sparc/pmap.c
--- a/sys/arch/sparc/sparc/pmap.c       Fri Jul 02 16:59:17 1999 +0000
+++ b/sys/arch/sparc/sparc/pmap.c       Fri Jul 02 17:03:10 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.141.2.2 1999/06/22 16:42:45 perry Exp $ */
+/*     $NetBSD: pmap.c,v 1.141.2.3 1999/07/02 17:03:10 perry Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -1697,13 +1697,17 @@
 int
 mmu_pagein(pm, va, prot)
        struct pmap *pm;
-       int va, prot;
+       vaddr_t va;
+       int prot;
 {
        int *pte;
        int vr, vs, pmeg, i, s, bits;
        struct regmap *rp;
        struct segmap *sp;
 
+       if (va >= (unsigned long)KERNBASE)
+               return (0);
+
        if (prot != VM_PROT_NONE)
                bits = PG_V | ((prot & VM_PROT_WRITE) ? PG_W : 0);
        else
@@ -1711,6 +1715,7 @@
 
        vr = VA_VREG(va);
        vs = VA_VSEG(va);
+
        rp = &pm->pm_regmap[vr];
 #ifdef DEBUG
 if (pm == pmap_kernel())