aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/sched.c52
1 files changed, 26 insertions, 26 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index f582e2cedb09..e717047be5cf 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -193,17 +193,17 @@ static struct sched_entity *init_sched_entity_p[NR_CPUS];
193static struct cfs_rq *init_cfs_rq_p[NR_CPUS]; 193static struct cfs_rq *init_cfs_rq_p[NR_CPUS];
194 194
195/* Default task group. 195/* Default task group.
196 * Every task in system belong to this group at bootup. 196 * Every task in system belong to this group at bootup.
197 */ 197 */
198struct task_grp init_task_grp = { 198struct task_grp init_task_grp = {
199 .se = init_sched_entity_p, 199 .se = init_sched_entity_p,
200 .cfs_rq = init_cfs_rq_p, 200 .cfs_rq = init_cfs_rq_p,
201 }; 201};
202 202
203#ifdef CONFIG_FAIR_USER_SCHED 203#ifdef CONFIG_FAIR_USER_SCHED
204#define INIT_TASK_GRP_LOAD 2*NICE_0_LOAD 204# define INIT_TASK_GRP_LOAD 2*NICE_0_LOAD
205#else 205#else
206#define INIT_TASK_GRP_LOAD NICE_0_LOAD 206# define INIT_TASK_GRP_LOAD NICE_0_LOAD
207#endif 207#endif
208 208
209static int init_task_grp_load = INIT_TASK_GRP_LOAD; 209static int init_task_grp_load = INIT_TASK_GRP_LOAD;
@@ -6516,25 +6516,25 @@ void __init sched_init(void)
6516 init_cfs_rq(&rq->cfs, rq); 6516 init_cfs_rq(&rq->cfs, rq);
6517#ifdef CONFIG_FAIR_GROUP_SCHED 6517#ifdef CONFIG_FAIR_GROUP_SCHED
6518 INIT_LIST_HEAD(&rq->leaf_cfs_rq_list); 6518 INIT_LIST_HEAD(&rq->leaf_cfs_rq_list);
6519 { 6519 {
6520 struct cfs_rq *cfs_rq = &per_cpu(init_cfs_rq, i); 6520 struct cfs_rq *cfs_rq = &per_cpu(init_cfs_rq, i);
6521 struct sched_entity *se = 6521 struct sched_entity *se =
6522 &per_cpu(init_sched_entity, i); 6522 &per_cpu(init_sched_entity, i);
6523 6523
6524 init_cfs_rq_p[i] = cfs_rq; 6524 init_cfs_rq_p[i] = cfs_rq;
6525 init_cfs_rq(cfs_rq, rq); 6525 init_cfs_rq(cfs_rq, rq);
6526 cfs_rq->tg = &init_task_grp; 6526 cfs_rq->tg = &init_task_grp;
6527 list_add(&cfs_rq->leaf_cfs_rq_list, 6527 list_add(&cfs_rq->leaf_cfs_rq_list,
6528 &rq->leaf_cfs_rq_list); 6528 &rq->leaf_cfs_rq_list);
6529 6529
6530 init_sched_entity_p[i] = se; 6530 init_sched_entity_p[i] = se;
6531 se->cfs_rq = &rq->cfs; 6531 se->cfs_rq = &rq->cfs;
6532 se->my_q = cfs_rq; 6532 se->my_q = cfs_rq;
6533 se->load.weight = init_task_grp_load; 6533 se->load.weight = init_task_grp_load;
6534 se->load.inv_weight = 6534 se->load.inv_weight =
6535 div64_64(1ULL<<32, init_task_grp_load); 6535 div64_64(1ULL<<32, init_task_grp_load);
6536 se->parent = NULL; 6536 se->parent = NULL;
6537 } 6537 }
6538 init_task_grp.shares = init_task_grp_load; 6538 init_task_grp.shares = init_task_grp_load;
6539#endif 6539#endif
6540 6540
@@ -6840,9 +6840,9 @@ void sched_destroy_group(struct task_grp *tg)
6840} 6840}
6841 6841
6842/* change task's runqueue when it moves between groups. 6842/* change task's runqueue when it moves between groups.
6843 * The caller of this function should have put the task in its new group 6843 * The caller of this function should have put the task in its new group
6844 * by now. This function just updates tsk->se.cfs_rq and tsk->se.parent to 6844 * by now. This function just updates tsk->se.cfs_rq and tsk->se.parent to
6845 * reflect its new group. 6845 * reflect its new group.
6846 */ 6846 */
6847void sched_move_task(struct task_struct *tsk) 6847void sched_move_task(struct task_struct *tsk)
6848{ 6848{
@@ -6915,4 +6915,4 @@ int sched_group_set_shares(struct task_grp *tg, unsigned long shares)
6915 return 0; 6915 return 0;
6916} 6916}
6917 6917
6918#endif /* CONFIG_FAIR_GROUP_SCHED */ 6918#endif /* CONFIG_FAIR_GROUP_SCHED */