Merge branch 'sched/urgent' into sched/core, to pick up fixes

[linux-2.6-block.git] / include / linux / sched.h

diff --git a/include/linux/sched.h b/include/linux/sched.h
index dee41bf59e6b8f7b2220d3fd28062cf6c5629395..b45acfd18f4eb79fad29550f8cdea22843c25ef8 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -3010,7 +3010,7 @@ static inline int object_is_on_stack(void *obj)
        return (obj >= stack) && (obj < (stack + THREAD_SIZE));
 }
 
-extern void thread_info_cache_init(void);
+extern void thread_stack_cache_init(void);
 
 #ifdef CONFIG_DEBUG_STACK_USAGE
 static inline unsigned long stack_not_used(struct task_struct *p)