From aa2560fa27469d65423a2ee6d181dc9d544325f8 Mon Sep 17 00:00:00 2001 From: Andrew Vagin Date: Fri, 11 Nov 2011 17:04:00 +0300 Subject: [PATCH] --- yaml --- r: 277376 b: refs/heads/master c: a3e5d1091c1298ded486aba87c22fe90cb55ea6c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f06b832d7042..1349cd394957 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4d6f6c2649c2c47261db4dcc3110d6f22202ea2 +refs/heads/master: a3e5d1091c1298ded486aba87c22fe90cb55ea6c diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 0df69866a04e..c9e3ab6e299e 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -793,14 +793,18 @@ static inline struct task_group *task_group(struct task_struct *p) /* Change a task's cfs_rq and parent entity if it moves across CPUs/groups */ static inline void set_task_rq(struct task_struct *p, unsigned int cpu) { +#if defined(CONFIG_FAIR_GROUP_SCHED) || defined(CONFIG_RT_GROUP_SCHED) + struct task_group *tg = task_group(p); +#endif + #ifdef CONFIG_FAIR_GROUP_SCHED - p->se.cfs_rq = task_group(p)->cfs_rq[cpu]; - p->se.parent = task_group(p)->se[cpu]; + p->se.cfs_rq = tg->cfs_rq[cpu]; + p->se.parent = tg->se[cpu]; #endif #ifdef CONFIG_RT_GROUP_SCHED - p->rt.rt_rq = task_group(p)->rt_rq[cpu]; - p->rt.parent = task_group(p)->rt_se[cpu]; + p->rt.rt_rq = tg->rt_rq[cpu]; + p->rt.parent = tg->rt_se[cpu]; #endif }