sched: rename per cpu variable init_cfs_rq so that it does not share a common name with a function within the same scope.

From: Anirban Sinha
Date: Sat Aug 29 2009 - 01:42:16 EST

Resending the same patch since the previous patch might have had some
whitespace issues.


Signed-off-by: Anirban Sinha <asinha@xxxxxxxxxxxxxxxxx>
kernel/sched.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/sched.c b/kernel/sched.c
index 1b59e26..e1e97b3 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -318,7 +318,7 @@ struct task_group root_task_group;
/* Default task group's sched entity on each cpu */
static DEFINE_PER_CPU(struct sched_entity, init_sched_entity);
/* Default task group's cfs_rq on each cpu */
-static DEFINE_PER_CPU(struct cfs_rq, init_cfs_rq)
+static DEFINE_PER_CPU(struct cfs_rq, init_tg_cfs_rq)

@@ -9304,11 +9304,11 @@ void __init sched_init(void)
* system cpu resource, based on the weight assigned to
* user's cpu share (INIT_TASK_GROUP_LOAD). This is
* by letting tasks of init_task_group sit in a separate
- * (init_cfs_rq) and having one entity represent this
group of
+ * (init_tg_cfs_rq) and having one entity represent this
group of
* tasks in rq->cfs (i.e init_task_group->se[] != NULL).
- &per_cpu(init_cfs_rq, i),
+ &per_cpu(init_tg_cfs_rq, i),
&per_cpu(init_sched_entity, i), i, 1,[i]);


To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at