diff options
Diffstat (limited to 'kernel/sched.c')
-rw-r--r-- | kernel/sched.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 523e20a62695..6244d24cafc1 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -309,8 +309,8 @@ void set_tg_uid(struct user_struct *user) | |||
309 | 309 | ||
310 | /* | 310 | /* |
311 | * Root task group. | 311 | * Root task group. |
312 | * Every UID task group (including init_task_group aka UID-0) will | 312 | * Every UID task group (including init_task_group aka UID-0) will |
313 | * be a child to this group. | 313 | * be a child to this group. |
314 | */ | 314 | */ |
315 | struct task_group root_task_group; | 315 | struct task_group root_task_group; |
316 | 316 | ||
@@ -318,7 +318,7 @@ struct task_group root_task_group; | |||
318 | /* Default task group's sched entity on each cpu */ | 318 | /* Default task group's sched entity on each cpu */ |
319 | static DEFINE_PER_CPU(struct sched_entity, init_sched_entity); | 319 | static DEFINE_PER_CPU(struct sched_entity, init_sched_entity); |
320 | /* Default task group's cfs_rq on each cpu */ | 320 | /* Default task group's cfs_rq on each cpu */ |
321 | static DEFINE_PER_CPU(struct cfs_rq, init_cfs_rq) ____cacheline_aligned_in_smp; | 321 | static DEFINE_PER_CPU(struct cfs_rq, init_tg_cfs_rq) ____cacheline_aligned_in_smp; |
322 | #endif /* CONFIG_FAIR_GROUP_SCHED */ | 322 | #endif /* CONFIG_FAIR_GROUP_SCHED */ |
323 | 323 | ||
324 | #ifdef CONFIG_RT_GROUP_SCHED | 324 | #ifdef CONFIG_RT_GROUP_SCHED |
@@ -9400,11 +9400,11 @@ void __init sched_init(void) | |||
9400 | * system cpu resource, based on the weight assigned to root | 9400 | * system cpu resource, based on the weight assigned to root |
9401 | * user's cpu share (INIT_TASK_GROUP_LOAD). This is accomplished | 9401 | * user's cpu share (INIT_TASK_GROUP_LOAD). This is accomplished |
9402 | * by letting tasks of init_task_group sit in a separate cfs_rq | 9402 | * by letting tasks of init_task_group sit in a separate cfs_rq |
9403 | * (init_cfs_rq) and having one entity represent this group of | 9403 | * (init_tg_cfs_rq) and having one entity represent this group of |
9404 | * tasks in rq->cfs (i.e init_task_group->se[] != NULL). | 9404 | * tasks in rq->cfs (i.e init_task_group->se[] != NULL). |
9405 | */ | 9405 | */ |
9406 | init_tg_cfs_entry(&init_task_group, | 9406 | init_tg_cfs_entry(&init_task_group, |
9407 | &per_cpu(init_cfs_rq, i), | 9407 | &per_cpu(init_tg_cfs_rq, i), |
9408 | &per_cpu(init_sched_entity, i), i, 1, | 9408 | &per_cpu(init_sched_entity, i), i, 1, |
9409 | root_task_group.se[i]); | 9409 | root_task_group.se[i]); |
9410 | 9410 | ||