Merge of MACHINE_NEW_CONTIG (aka MNN) code from Chuck Cranor,

<chuck@openbsd.org>. This code is as of yet disabled on all platforms,
actually not yet supported on more than mvme68k, although other
platforms are expected soon, as code is already available.
This code makes handling of multiple physical memory regions
consistent over all platforms, as well as keeping the performance of
maintaining a single continuous memory chunk.  It is also a
requirement for the upcoming UVM replacement VM system.

What I did in this merge: just declared the pmap_map function in a
MD include file per port that needs it.  It's not an exported pmap
interface, says Chuck.  It ended up in differnt include files on
differnet ports, as I tried to follow the current policy on a per-arch
basis.

1 files changed, 4 insertions, 4 deletions

diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h
index 7c4522a0740..53114a4e8c1 100644
--- a/sys/vm/vm_object.h
+++ b/sys/vm/vm_object.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_object.h,v 1.8 1997/11/06 05:59:36 csapuntz Exp $	*/
+/*	$OpenBSD: vm_object.h,v 1.9 1998/03/01 00:38:17 niklas Exp $	*/
 /*	$NetBSD: vm_object.h,v 1.16 1995/03/29 22:10:28 briggs Exp $	*/
 
 /* 
@@ -150,7 +150,7 @@ vm_object_t	kmem_object;
 	do {								\
 		(object)->flags |= OBJ_WAITING;				\
 		thread_sleep_msg((event), &(object)->Lock,		\
-		    (interruptible), (where));				\
+		    (interruptible), (where), 0);			\
 	} while (0)
 
 #define	vm_object_wakeup(object) \
@@ -184,11 +184,11 @@ vm_object_t	kmem_object;
 			vm_object_wakeup((object));			\
 	} while (0)
 
-#define	vm_object_paging_wait(object) \
+#define	vm_object_paging_wait(object,msg) \
 	do {								\
 		while (vm_object_paging((object))) {			\
 			vm_object_sleep((object), (object), FALSE,	\
-			    "vospgw");					\
+			    (msg));					\
 			vm_object_lock((object));			\
 		}							\
 	} while (0)