scheduler fixes
Linus,
Please pull the latest sched-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git sched-fixes-for-linus
Thanks,
Ingo
------------------>
Cyrill Gorcunov (1):
sched: Use root_task_group_empty only with FAIR_GROUP_SCHED
Randy Dunlap (1):
sched: Fix kernel-doc function parameter name
kernel/sched.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
kernel/sched.c +3 -2
@@ -309,6 +309,8 @@ static DEFINE_PER_CPU_SHARED_ALIGNED(struct rt_rq, init_rt_rq);*/ static DEFINE_SPINLOCK (task_group_lock); +#ifdef CONFIG_FAIR_GROUP_SCHED + #ifdef CONFIG_SMP static int root_task_group_empty(void) {
@@ -316,7 +318,6 @@ static int root_task_group_empty(void) }#endif -#ifdef CONFIG_FAIR_GROUP_SCHED #ifdef CONFIG_USER_SCHED # define INIT_TASK_GROUP_LOAD (2*NICE_0_LOAD)#else /* !CONFIG_USER_SCHED */
@@ -1994,7 +1995,7 @@ static inline void check_class_changed(struct rq *rq, struct task_struct *p,/** * kthread_bind - bind a just-created kthread to a cpu. -* @k: thread created by kthread_create(). +* @p: thread created by kthread_create(). * @cpu: cpu (might not be online, must be possible) for @k to run on. * * Description: This function is equivalent to set_cpus_allowed(),