Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 6 insertions, 1 deletions

diff --git a/init/main.c b/init/main.c
index 833a67df1f7e..1687b0167c4a 100644
--- a/init/main.c
+++ b/init/main.c
@@ -521,7 +521,11 @@ static void __init boot_cpu_init(void)
         cpu_set(cpu, cpu_possible_map);
 }
 
-void __init __attribute__((weak)) smp_setup_processor_id(void)
+void __init __weak smp_setup_processor_id(void)
+{
+}
+
+void __init __weak thread_info_cache_init(void)
 {
 }
 
@@ -645,6 +649,7 @@ asmlinkage void __init start_kernel(void)
         if (efi_enabled)
                 efi_enter_virtual_mode();
 #endif
+        thread_info_cache_init();
         fork_init(num_physpages);
         proc_caches_init();
         buffer_init();