lkml.org 
[lkml]   [2009]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH] init: call vfs_caches_init_early() later in the boot sequence
From
Date
From: Pekka Enberg <penberg@cs.helsinki.fi>

There's no need to call vfs_caches_init_early() before kmem_cache_init(). All
we have to do is make sure we don't attempt to use the bootmem allocator after
we've called mem_init().

Cc: Christoph Lameter <cl@linux-foundation.com>
Cc: Linus Torvalds <torvals@linux-foundation.org>
Cc: Matt Mackall <mpm@selenic.com>
Cc: Nick Piggin <npiggin@suse.de>
Cc: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
---
fs/dcache.c | 2 +-
fs/inode.c | 2 +-
init/main.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/dcache.c b/fs/dcache.c
index ee60ce4..6c48ba1 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -2255,7 +2255,7 @@ static void __init dcache_init_early(void)
sizeof(struct hlist_head),
dhash_entries,
13,
- HASH_EARLY,
+ 0,
&d_hash_shift,
&d_hash_mask,
0);
diff --git a/fs/inode.c b/fs/inode.c
index 0571983..92379c8 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1487,7 +1487,7 @@ void __init inode_init_early(void)
sizeof(struct hlist_head),
ihash_entries,
14,
- HASH_EARLY,
+ 0,
&i_hash_shift,
&i_hash_mask,
0);
diff --git a/init/main.c b/init/main.c
index 5a19578..f6bd51f 100644
--- a/init/main.c
+++ b/init/main.c
@@ -588,7 +588,6 @@ asmlinkage void __init start_kernel(void)
* kmem_cache_init()
*/
pidhash_init();
- vfs_caches_init_early();
/*
* Set up kernel memory allocators
*/
@@ -658,6 +657,7 @@ asmlinkage void __init start_kernel(void)
initrd_start = 0;
}
#endif
+ vfs_caches_init_early();
cpuset_init_early();
page_cgroup_init();
enable_debug_pagealloc();
--
1.6.0.4




\
 
 \ /
  Last update: 2009-05-28 15:33    [W:0.149 / U:0.168 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site