Move most of the kernel submap initialization code, including the

timeout callwheel and buffer cache, out of the platform specific areas
and into the machine independant area.  i386 and alpha adjusted here.
Other cpus can be fixed piecemeal.

Reviewed by:    freebsd-smp, jake

2 files changed, 7 insertions, 12 deletions

diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index f5c2694..95216bc 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -198,9 +198,8 @@ vm_offset_t phys_avail[10];
 /* must be 2 less so 0 0 can signal end of chunks */
 #define PHYS_AVAIL_ARRAY_END ((sizeof(phys_avail) / sizeof(vm_offset_t)) - 2)
 
-static vm_offset_t buffer_sva, buffer_eva;
-vm_offset_t clean_sva, clean_eva;
-static vm_offset_t pager_sva, pager_eva;
+struct kva_md_info kmi;
+
 static struct trapframe proc0_tf;
 #ifndef SMP
 static struct globaldata __globaldata;
@@ -213,14 +212,6 @@ static void
 cpu_startup(dummy)
 	void *dummy;
 {
-	register unsigned i;
-	register caddr_t v;
-	vm_offset_t maxaddr;
-	vm_size_t size = 0;
-	int firstaddr;
-	vm_offset_t minaddr;
-	int physmem_est;	/* in pages */
-
 	/*
 	 * Good {morning,afternoon,evening,night}.
 	 */
@@ -250,6 +241,9 @@ cpu_startup(dummy)
 		}
 	}
 
+	vm_ksubmap_init(&kmi);
+
+#if 0
 	/*
 	 * Calculate callout wheel size
 	 */
@@ -387,6 +381,7 @@ again:
 	}
 
 	mtx_init(&callout_lock, "callout", MTX_SPIN | MTX_RECURSE);
+#endif
 
 #if defined(USERCONFIG)
 	userconfig();
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 7a32c98b..f6d0984 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -547,7 +547,7 @@ pmap_nw_modified(pt_entry_t ptea)
 static PMAP_INLINE int
 pmap_track_modified(vm_offset_t va)
 {
-	if ((va < clean_sva) || (va >= clean_eva)) 
+	if ((va < kmi.clean_sva) || (va >= kmi.clean_eva)) 
 		return 1;
 	else
 		return 0;