vm/vm_map: merge vm_map_bootstrap into vm_map_setup

3 files changed, 1 insertions, 14 deletions

diff --git a/vm/vm_map.c b/vm/vm_map.c
index b987fb74..e085a8f1 100644
--- a/vm/vm_map.c
+++ b/vm/vm_map.c
@@ -727,7 +727,7 @@ vm_map_init(struct vm_map *map, struct pmap *pmap, unsigned long start,
 }
 
 void __init
-vm_map_bootstrap(void)
+vm_map_setup(void)
 {
     struct vm_map_request request;
     unsigned long start, end;
@@ -753,11 +753,7 @@ vm_map_bootstrap(void)
     assert(!error);
 
     vm_map_kentry_setup();
-}
 
-void __init
-vm_map_setup(void)
-{
     kmem_cache_init(&vm_map_entry_cache, "vm_map_entry",
                     sizeof(struct vm_map_entry), 0, NULL, NULL, NULL, 0);
 }
diff --git a/vm/vm_map.h b/vm/vm_map.h
index b3f25f3c..f739697a 100644
--- a/vm/vm_map.h
+++ b/vm/vm_map.h
@@ -115,14 +115,6 @@ int vm_map_enter(struct vm_map *map, struct vm_object *object, uint64_t offset,
 void vm_map_remove(struct vm_map *map, unsigned long start, unsigned long end);
 
 /*
- * Early initialization of the vm_map module.
- *
- * This function creates the kernel map and the kentry cache, making it
- * possible to map kernel memory.
- */
-void vm_map_bootstrap(void);
-
-/*
  * Set up the vm_map module.
  */
 void vm_map_setup(void);
diff --git a/vm/vm_setup.c b/vm/vm_setup.c
index fa8c8139..cca7ada6 100644
--- a/vm/vm_setup.c
+++ b/vm/vm_setup.c
@@ -27,6 +27,5 @@ vm_setup(void)
     vm_kmem_setup();
     vm_phys_setup();
     kmem_setup();
-    vm_map_bootstrap();
     vm_map_setup();
 }