From b77df1e33a9e281291d27c4eaac3f431a21d7a81 Mon Sep 17 00:00:00 2001
From: alc <alc@FreeBSD.org>
Date: Sun, 20 Nov 2005 06:09:49 +0000
Subject: [PATCH] Eliminate pmap_init2().  It's no longer used.

---
 sys/alpha/alpha/pmap.c              |  5 -----
 sys/amd64/amd64/pmap.c              |  5 -----
 sys/arm/arm/pmap.c                  |  5 -----
 sys/i386/i386/pmap.c                |  5 -----
 sys/ia64/ia64/pmap.c                |  5 -----
 sys/powerpc/powerpc/mmu_if.m        | 14 --------------
 sys/powerpc/powerpc/pmap_dispatch.c |  6 ------
 sys/sparc64/sparc64/pmap.c          | 10 ----------
 sys/vm/pmap.h                       |  1 -
 sys/vm/vm_map.c                     |  1 -
 10 files changed, 57 deletions(-)

diff --git a/sys/alpha/alpha/pmap.c b/sys/alpha/alpha/pmap.c
index 173755bb7d84..13704ffee05d 100644
--- a/sys/alpha/alpha/pmap.c
+++ b/sys/alpha/alpha/pmap.c
@@ -583,11 +583,6 @@ pmap_init(void)
 	pv_entry_high_water = 9 * (pv_entry_max / 10);
 }
 
-void
-pmap_init2()
-{
-}
-
 
 /***************************************************
  * Manipulate TLBs for a pmap
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index c623495e4987..aba9cfee0b7d 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -579,11 +579,6 @@ pmap_init(void)
 	uma_zone_set_obj(pvzone, &pvzone_obj, pv_entry_max);
 }
 
-void
-pmap_init2()
-{
-}
-
 
 /***************************************************
  * Low level helper routines.....
diff --git a/sys/arm/arm/pmap.c b/sys/arm/arm/pmap.c
index c782e79a9182..a682f8dff640 100644
--- a/sys/arm/arm/pmap.c
+++ b/sys/arm/arm/pmap.c
@@ -2198,11 +2198,6 @@ pmap_fault_fixup(pmap_t pm, vm_offset_t va, vm_prot_t ftype, int user)
 	return (rv);
 }
 
-void
-pmap_init2(void)
-{
-}
-
 void
 pmap_postinit(void)
 {
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 332a5b590bba..655fcf6ad118 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -504,11 +504,6 @@ pmap_init(void)
 #endif
 }
 
-void
-pmap_init2()
-{
-}
-
 
 /***************************************************
  * Low level helper routines.....
diff --git a/sys/ia64/ia64/pmap.c b/sys/ia64/ia64/pmap.c
index 98e494f2b066..2407d3d17aef 100644
--- a/sys/ia64/ia64/pmap.c
+++ b/sys/ia64/ia64/pmap.c
@@ -537,11 +537,6 @@ pmap_init(void)
 	    NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM|UMA_ZONE_NOFREE);
 }
 
-void
-pmap_init2()
-{
-}
-
 
 /***************************************************
  * Manipulate TLBs for a pmap
diff --git a/sys/powerpc/powerpc/mmu_if.m b/sys/powerpc/powerpc/mmu_if.m
index f816d49e642b..0289973e9663 100644
--- a/sys/powerpc/powerpc/mmu_if.m
+++ b/sys/powerpc/powerpc/mmu_if.m
@@ -67,11 +67,6 @@ CODE {
 		return;
 	}
 
-	static void mmu_null_init2(mmu_t mmu)
-	{
-		return;
-	}
-
 	static boolean_t mmu_null_is_prefaultable(mmu_t mmu, pmap_t pmap,
 	    vm_offset_t va)
 	{
@@ -289,15 +284,6 @@ METHOD void init {
 } DEFAULT mmu_null_init;
 
 
-/**
- * @brief Called from vm_init2/proc0_init, so can be used as a last-chance
- * init before process scheduling starts. This routine is optional.
- */
-METHOD void init2 {
-	mmu_t		_mmu;
-} DEFAULT mmu_null_init2;
-
-
 /**
  * @brief Return if the page has been marked by MMU hardware to have been
  * modified
diff --git a/sys/powerpc/powerpc/pmap_dispatch.c b/sys/powerpc/powerpc/pmap_dispatch.c
index 399ad06c9bbd..2fb2eb1dd5f8 100644
--- a/sys/powerpc/powerpc/pmap_dispatch.c
+++ b/sys/powerpc/powerpc/pmap_dispatch.c
@@ -146,12 +146,6 @@ pmap_init(void)
 	MMU_INIT(mmu_obj);
 }
 
-void
-pmap_init2(void)
-{
-	MMU_INIT2(mmu_obj);
-}
-
 boolean_t
 pmap_is_modified(vm_page_t m)
 {
diff --git a/sys/sparc64/sparc64/pmap.c b/sys/sparc64/sparc64/pmap.c
index e521022bfc1d..17f95af23eb3 100644
--- a/sys/sparc64/sparc64/pmap.c
+++ b/sys/sparc64/sparc64/pmap.c
@@ -588,16 +588,6 @@ pmap_init(void)
 	}
 }
 
-/*
- * Initialize the address space (zone) for the pv_entries.  Set a
- * high water mark so that the system can recover from excessive
- * numbers of pv entries.
- */
-void
-pmap_init2(void)
-{
-}
-
 /*
  * Extract the physical page address associated with the given
  * map/virtual_address pair.
diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h
index 2379171e47d2..d41011301f25 100644
--- a/sys/vm/pmap.h
+++ b/sys/vm/pmap.h
@@ -128,7 +128,6 @@ void		 pmap_zero_page_idle(vm_page_t);
 int		 pmap_mincore(pmap_t pmap, vm_offset_t addr);
 void		 pmap_activate(struct thread *td);
 vm_offset_t	 pmap_addr_hint(vm_object_t obj, vm_offset_t addr, vm_size_t size);
-void		 pmap_init2(void);
 
 #define	pmap_resident_count(pm)	((pm)->pm_stats.resident_count)
 #define	pmap_wired_count(pm)	((pm)->pm_stats.wired_count)
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index c162c509924a..64b605003f5e 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -279,7 +279,6 @@ vm_init2(void)
 	    NULL,
 #endif
 	    vmspace_zinit, vmspace_zfini, UMA_ALIGN_PTR, UMA_ZONE_NOFREE);
-	pmap_init2();
 }
 
 static __inline void