2 files changed, 6 insertions, 18 deletions

diff --git a/sys/alpha/alpha/pmap.c b/sys/alpha/alpha/pmap.c
index 73406fc3f2c9..3bf6bc108c37 100644
--- a/sys/alpha/alpha/pmap.c
+++ b/sys/alpha/alpha/pmap.c
@@ -305,8 +305,6 @@ vm_offset_t virtual_avail;	/* VA of first avail page (after kernel bss) */
 vm_offset_t virtual_end;	/* VA of last avail page (end of kernel AS) */
 static boolean_t pmap_initialized = FALSE;	/* Has pmap_init completed? */
 
-static vm_object_t kptobj;
-
 static int nklev3, nklev2;
 vm_offset_t kernel_vm_end;
 
@@ -647,10 +645,6 @@ pmap_init(phys_start, phys_end)
 	pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), NULL, NULL,
 	    NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM);
 	uma_prealloc(pvzone, initial_pvs);
-	/*
-	 * object for kernel page table pages
-	 */
-	kptobj = vm_object_allocate(OBJT_DEFAULT, NKLEV3MAPS + NKLEV2MAPS);
 
 	/*
 	 * Now it is safe to enable pv_table recording.
@@ -1646,8 +1640,8 @@ pmap_growkernel(vm_offset_t addr)
 		if (!pmap_pte_v(pte)) {
 			int pindex = NKLEV3MAPS + pmap_lev1_index(kernel_vm_end) - K1SEGLEV1I;
 
-			nkpg = vm_page_alloc(kptobj, pindex,
-			    VM_ALLOC_INTERRUPT | VM_ALLOC_WIRED);
+			nkpg = vm_page_alloc(NULL, pindex,
+			    VM_ALLOC_NOOBJ | VM_ALLOC_INTERRUPT | VM_ALLOC_WIRED);
 			if (!nkpg)
 				panic("pmap_growkernel: no memory to grow kernel");
 			printf("pmap_growkernel: growing to %lx\n", addr);
@@ -1681,8 +1675,8 @@ pmap_growkernel(vm_offset_t addr)
 		/*
 		 * This index is bogus, but out of the way
 		 */
-		nkpg = vm_page_alloc(kptobj, nklev3,
-		    VM_ALLOC_INTERRUPT | VM_ALLOC_WIRED);
+		nkpg = vm_page_alloc(NULL, nklev3,
+		    VM_ALLOC_NOOBJ | VM_ALLOC_INTERRUPT | VM_ALLOC_WIRED);
 		if (!nkpg)
 			panic("pmap_growkernel: no memory to grow kernel");
 
diff --git a/sys/ia64/ia64/pmap.c b/sys/ia64/ia64/pmap.c
index cb3d1d32df55..e5587b9b7a2b 100644
--- a/sys/ia64/ia64/pmap.c
+++ b/sys/ia64/ia64/pmap.c
@@ -196,7 +196,6 @@ vm_offset_t vhpt_base, vhpt_size;
  * we use one page directory to index a set of pages containing
  * ia64_lptes. This gives us up to 2Gb of kernel virtual space.
  */
-static vm_object_t kptobj;
 static int nkpt;
 static struct ia64_lpte **kptdir;
 #define KPTE_DIR_INDEX(va) \
@@ -558,11 +557,6 @@ pmap_init(vm_offset_t phys_start, vm_offset_t phys_end)
 	uma_prealloc(ptezone, initial_pvs);
 
 	/*
-	 * Create the object for the kernel's page tables.
-	 */
-	kptobj = vm_object_allocate(OBJT_DEFAULT, MAXKPT);
-
-	/*
 	 * Now it is safe to enable pv_table recording.
 	 */
 	pmap_initialized = TRUE;
@@ -924,8 +918,8 @@ pmap_growkernel(vm_offset_t addr)
 		/*
 		 * This index is bogus, but out of the way
 		 */
-		nkpg = vm_page_alloc(kptobj, nkpt,
-		    VM_ALLOC_SYSTEM | VM_ALLOC_WIRED);
+		nkpg = vm_page_alloc(NULL, nkpt,
+		    VM_ALLOC_NOOBJ | VM_ALLOC_SYSTEM | VM_ALLOC_WIRED);
 		if (!nkpg)
 			panic("pmap_growkernel: no memory to grow kernel");