X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=init%2Fmain.c;h=826fd57fa3aa8f8f6c47331d13172df70f8c44f3;hb=3522b35cb2e2e24e03edf112e6466f3a626918a9;hp=bc0f9e0bcf22460d787142db5b6dd1c4b61e5d88;hpb=0b9210c9c86e46a7a62bbc7b69b84001315072ff;p=deliverable%2Flinux.git

diff --git a/init/main.c b/init/main.c
index bc0f9e0bcf22..826fd57fa3aa 100644
--- a/init/main.c
+++ b/init/main.c
@@ -453,7 +453,7 @@ void __init __weak smp_setup_processor_id(void)
 }
 
 # if THREAD_SIZE >= PAGE_SIZE
-void __init __weak thread_info_cache_init(void)
+void __init __weak thread_stack_cache_init(void)
 {
 }
 #endif
@@ -607,6 +607,7 @@ asmlinkage __visible void __init start_kernel(void)
 		initrd_start = 0;
 	}
 #endif
+	page_ext_init();
 	debug_objects_mem_init();
 	kmemleak_init();
 	setup_per_cpu_pageset();
@@ -626,7 +627,7 @@ asmlinkage __visible void __init start_kernel(void)
 	/* Should be run before the first non-init thread is created */
 	init_espfix_bsp();
 #endif
-	thread_info_cache_init();
+	thread_stack_cache_init();
 	cred_init();
 	fork_init();
 	proc_caches_init();
@@ -1003,8 +1004,6 @@ static noinline void __init kernel_init_freeable(void)
 	sched_init_smp();
 
 	page_alloc_init_late();
-	/* Initialize page ext after all struct pages are initializaed */
-	page_ext_init();
 
 	do_basic_setup();