summaryrefslogtreecommitdiff
path: root/kern/kmem.c
diff options
context:
space:
mode:
authorRichard Braun <rbraun@sceen.net>2012-12-01 15:44:24 +0100
committerRichard Braun <rbraun@sceen.net>2012-12-01 15:44:24 +0100
commitcf06fbde7911c5380d9f145f55168cddb4f01bd4 (patch)
tree8364771a4b3b326f97b4de93eef778557ec775ec /kern/kmem.c
parent7639d05dcb960c91ba0bd18daa55b4deb30e8b52 (diff)
kern/kmem: merge kmem_bootstrap into kmem_setup
Diffstat (limited to 'kern/kmem.c')
-rw-r--r--kern/kmem.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/kern/kmem.c b/kern/kmem.c
index 2718c09e..c8c55579 100644
--- a/kern/kmem.c
+++ b/kern/kmem.c
@@ -1073,21 +1073,17 @@ kmem_cache_info(struct kmem_cache *cache)
}
void __init
-kmem_bootstrap(void)
+kmem_setup(void)
{
+ struct kmem_cpu_pool_type *cpu_pool_type;
+ char name[KMEM_NAME_SIZE];
+ size_t i, size;
+
/* Make sure a bufctl can always be stored in a buffer */
assert(sizeof(union kmem_bufctl) <= KMEM_ALIGN_MIN);
list_init(&kmem_cache_list);
/* mutex_init(&kmem_cache_list_mutex); */
-}
-
-void __init
-kmem_setup(void)
-{
- struct kmem_cpu_pool_type *cpu_pool_type;
- char name[KMEM_NAME_SIZE];
- size_t i, size;
for (i = 0; i < ARRAY_SIZE(kmem_cpu_pool_types); i++) {
cpu_pool_type = &kmem_cpu_pool_types[i];