[src/netbsd-1-5]: src/sys/arch/i386/i386 Pull up revision 1.97 (requested by ...

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

details:   https://anonhg.NetBSD.org/src/rev/66c68ed40b67
branches:  netbsd-1-5
changeset: 490974:66c68ed40b67
user:      he <he%NetBSD.org@localhost>
date:      Fri Mar 30 21:31:22 2001 +0000

description:
Pull up revision 1.97 (requested by fvdl):
  Add some required Linux emulation bits to support the Linux
  version of VMware.

diffstat:

 sys/arch/i386/i386/vm_machdep.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 333c60702d1e -r 66c68ed40b67 sys/arch/i386/i386/vm_machdep.c
--- a/sys/arch/i386/i386/vm_machdep.c   Fri Mar 30 21:30:54 2001 +0000
+++ b/sys/arch/i386/i386/vm_machdep.c   Fri Mar 30 21:31:22 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vm_machdep.c,v 1.89.2.1 2000/08/16 23:18:24 thorpej Exp $      */
+/*     $NetBSD: vm_machdep.c,v 1.89.2.2 2001/03/30 21:31:22 he Exp $   */
 
 /*-
  * Copyright (c) 1995 Charles M. Hannum.  All rights reserved.
@@ -384,8 +384,7 @@
        while (len) {
                (void) pmap_extract(vm_map_pmap(&bp->b_proc->p_vmspace->vm_map),
                    faddr, &fpa);
-               pmap_enter(vm_map_pmap(phys_map), taddr, fpa,
-                          VM_PROT_READ|VM_PROT_WRITE, PMAP_WIRED);
+               pmap_kenter_pa(taddr, fpa, VM_PROT_READ|VM_PROT_WRITE);
                faddr += PAGE_SIZE;
                taddr += PAGE_SIZE;
                len -= PAGE_SIZE;
@@ -407,6 +406,7 @@
        addr = trunc_page((vaddr_t)bp->b_data);
        off = (vaddr_t)bp->b_data - addr;
        len = round_page(off + len);
+       pmap_kremove(addr, len);
        uvm_km_free_wakeup(phys_map, addr, len);
        bp->b_data = bp->b_saveaddr;
        bp->b_saveaddr = 0;