diff --git a/[refs] b/[refs] index b57d13108955..d7f9bd51c9ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d32e21889b96e594e8b63b193bf7d2a51ab93ec +refs/heads/master: 8c9843e57a7d9d7a090d6467a0f1f3afb8031527 diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h index 311380e5fe89..d0bd97044abd 100644 --- a/trunk/include/linux/sched.h +++ b/trunk/include/linux/sched.h @@ -1926,6 +1926,8 @@ static inline unsigned long *end_of_stack(struct task_struct *p) #endif +extern void thread_info_cache_init(void); + /* set thread flags in other task's structures * - see asm/thread_info.h for TIF_xxxx flags available */ diff --git a/trunk/init/main.c b/trunk/init/main.c index 833a67df1f7e..507c9fba03bb 100644 --- a/trunk/init/main.c +++ b/trunk/init/main.c @@ -525,6 +525,10 @@ void __init __attribute__((weak)) smp_setup_processor_id(void) { } +void __init __weak thread_info_cache_init(void) +{ +} + asmlinkage void __init start_kernel(void) { char * command_line; @@ -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();