Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
yamt 2005-05-17 13:54:19 +00:00
parent ffda7fbfaa
commit 1e5d4510fa
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/uvm/uvm_map.c
View File

@ -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 @@ uvm_map_enter(struct vm_map *map, const struct uvm_map_args *args,
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 @@ uvm_map_enter(struct vm_map *map, const struct uvm_map_args *args,
}
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;