remove mb_object*; ok tedu

3 files changed, 8 insertions, 23 deletions

diff --git a/sys/uvm/uvm_extern.h b/sys/uvm/uvm_extern.h
index d20e6d25639..09a5f357cc9 100644
--- a/sys/uvm/uvm_extern.h
+++ b/sys/uvm/uvm_extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_extern.h,v 1.51 2004/04/19 22:52:33 tedu Exp $	*/
+/*	$OpenBSD: uvm_extern.h,v 1.52 2004/04/28 02:20:58 markus Exp $	*/
 /*	$NetBSD: uvm_extern.h,v 1.57 2001/03/09 01:02:12 chs Exp $	*/
 
 /*
@@ -357,7 +357,6 @@ struct uvmexp {
 
 	/* kernel memory objects: managed by uvm_km_kmemalloc() only! */
 	struct uvm_object *kmem_object;
-	struct uvm_object *mb_object;
 };
 
 #ifdef _KERNEL
diff --git a/sys/uvm/uvm_km.c b/sys/uvm/uvm_km.c
index b35544009be..9d4ffa0d081 100644
--- a/sys/uvm/uvm_km.c
+++ b/sys/uvm/uvm_km.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_km.c,v 1.37 2004/04/20 09:39:36 markus Exp $	*/
+/*	$OpenBSD: uvm_km.c,v 1.38 2004/04/28 02:20:58 markus Exp $	*/
 /*	$NetBSD: uvm_km.c,v 1.42 2001/01/14 02:10:01 thorpej Exp $	*/
 
 /* 
@@ -109,7 +109,7 @@
  * most kernel private memory lives in kernel_object.   the only exception
  * to this is for memory that belongs to submaps that must be protected
  * by splvm().    each of these submaps has their own private kernel 
- * object (e.g. kmem_object, mb_object).
+ * object (e.g. kmem_object).
  *
  * note that just because a kernel object spans the entire kernel virtual
  * address space doesn't mean that it has to be mapped into the entire space.
@@ -128,8 +128,8 @@
  *   then that means that the page at offset 0x235000 in kernel_object is
  *   mapped at 0xf8235000.   
  *
- * note that the offsets in kmem_object and mb_object also follow this
- * rule.   this means that the offsets for kmem_object must fall in the
+ * note that the offsets in kmem_object also follow this rule.
+ * this means that the offsets for kmem_object must fall in the
  * range of [vm_map_min(kmem_object) - vm_map_min(kernel_map)] to
  * [vm_map_max(kmem_object) - vm_map_min(kernel_map)], so the offsets
  * in those objects will typically not start at zero.
@@ -163,7 +163,6 @@ simple_lock_data_t vmi_list_slock;
 
 static struct vm_map		kernel_map_store;
 static struct uvm_object	kmem_object_store;
-static struct uvm_object	mb_object_store;
 
 /*
  * All pager operations here are NULL, but the object must have
@@ -216,19 +215,6 @@ uvm_km_init(start, end)
 	uvmexp.kmem_object = &kmem_object_store;
 
 	/*
-	 * mb_object: for mbuf cluster pages on platforms which use the
-	 * mb_map.  Memory is always wired, and this object (and the mb_map)
-	 * can be accessed at interrupt time.
-	 */
-	simple_lock_init(&mb_object_store.vmobjlock);
-	mb_object_store.pgops = &km_pager;
-	TAILQ_INIT(&mb_object_store.memq);
-	mb_object_store.uo_npages = 0;
-	/* we are special.  we never die */
-	mb_object_store.uo_refs = UVM_OBJ_KERN_INTRSAFE; 
-	uvmexp.mb_object = &mb_object_store;
-
-	/*
 	 * init the map and reserve already allocated kernel space 
 	 * before installing.
 	 */
diff --git a/sys/uvm/uvm_stat.c b/sys/uvm/uvm_stat.c
index 82404906375..4af2f3b6c72 100644
--- a/sys/uvm/uvm_stat.c
+++ b/sys/uvm/uvm_stat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_stat.c,v 1.14 2003/03/29 01:13:57 mickey Exp $	 */
+/*	$OpenBSD: uvm_stat.c,v 1.15 2004/04/28 02:20:58 markus Exp $	 */
 /*	$NetBSD: uvm_stat.c,v 1.18 2001/03/09 01:02:13 chs Exp $	 */
 
 /*
@@ -254,7 +254,7 @@ uvmexp_print(int (*pr)(const char *, ...))
 	    uvmexp.swpages, uvmexp.swpginuse, uvmexp.swpgonly, uvmexp.paging);
 
 	(*pr)("  kernel pointers:\n");
-	(*pr)("    objs(kern/kmem/mb)=%p/%p/%p\n", uvm.kernel_object,
-	    uvmexp.kmem_object, uvmexp.mb_object);
+	(*pr)("    objs(kern/kmem)=%p/%p\n", uvm.kernel_object,
+	    uvmexp.kmem_object);
 }
 #endif