[src/trunk]: src/sys/uvm revert uvm_map.c rev.1.190 in favor of merging in fa...

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

details:   https://anonhg.NetBSD.org/src/rev/6b442fb0d8cc
branches:  trunk
changeset: 580955:6b442fb0d8cc
user:      yamt <yamt%NetBSD.org@localhost>
date:      Tue May 17 13:54:19 2005 +0000

description:
revert uvm_map.c rev.1.190 in favor of merging in fault handler.

diffstat:

 sys/uvm/uvm_map.c |  18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)

diffs (58 lines):

diff -r 6250e7566c75 -r 6b442fb0d8cc sys/uvm/uvm_map.c
--- a/sys/uvm/uvm_map.c Tue May 17 13:52:07 2005 +0000
+++ b/sys/uvm/uvm_map.c Tue May 17 13:54:19 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_map.c,v 1.192 2005/05/11 13:02:25 yamt Exp $       */
+/*     $NetBSD: uvm_map.c,v 1.193 2005/05/17 13:54:19 yamt Exp $       */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.192 2005/05/11 13:02:25 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.193 2005/05/17 13:54:19 yamt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_uvmhist.h"
@@ -1010,17 +1010,14 @@
        if (flags & UVM_FLAG_NOMERGE)
                goto nomerge;
 
-       if (prev_entry->end == start &&
+       if (prev_entry->etype == newetype &&
+           prev_entry->end == start &&
            prev_entry != &map->header &&
            prev_entry->object.uvm_obj == uobj) {
 
                if ((prev_entry->flags & meflagmask) != meflagval)
                        goto forwardmerge;
 
-               if (prev_entry->etype != newetype &&
-                   (prev_entry->etype | UVM_ET_NEEDSCOPY) != newetype)
-                       goto forwardmerge;
-
                if (uobj && prev_entry->offset +
                    (prev_entry->end - prev_entry->start) != uoffset)
                        goto forwardmerge;
@@ -1079,17 +1076,14 @@
        }
 
 forwardmerge:
-       if (prev_entry->next->start == (start + size) &&
+       if (prev_entry->next->etype == newetype &&
+           prev_entry->next->start == (start + size) &&
            prev_entry->next != &map->header &&
            prev_entry->next->object.uvm_obj == uobj) {
 
                if ((prev_entry->next->flags & meflagmask) != meflagval)
                        goto nomerge;
 
-               if (prev_entry->next->etype != newetype &&
-                   (prev_entry->next->etype | UVM_ET_NEEDSCOPY) != newetype)
-                       goto nomerge;
-
                if (uobj && prev_entry->next->offset != uoffset + size)
                        goto nomerge;