Module Name:	src
Committed By:	matt
Date:		Tue Feb 10 01:30:49 UTC 2004

Modified Files:
	src/sys/uvm: uvm.h uvm_km.c uvm_map.c uvm_map.h uvm_map_i.h

Log Message:
Back out the changes in
http://mail-index.netbsd.org/source-changes/2004/01/29/0027.html
since they don't really fix the problem.

Incorpate one fix:  Mark uvm_map_entry's that were created with
UVM_FLAG_NOMERGE so that they will not be used as future merge
candidates.


To generate a diff of this commit:
cvs rdiff -r1.36 -r1.37 src/sys/uvm/uvm.h
cvs rdiff -r1.67 -r1.68 src/sys/uvm/uvm_km.c
cvs rdiff -r1.160 -r1.161 src/sys/uvm/uvm_map.c
cvs rdiff -r1.38 -r1.39 src/sys/uvm/uvm_map.h
cvs rdiff -r1.27 -r1.28 src/sys/uvm/uvm_map_i.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.