aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sched.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/sched.c')
-rw-r--r--kernel/sched.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 28229c5d4983..716cfc8e099e 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -433,12 +433,6 @@ struct cfs_rq {
433 * The sum of all runqueue weights within this span. 433 * The sum of all runqueue weights within this span.
434 */ 434 */
435 unsigned long rq_weight; 435 unsigned long rq_weight;
436
437 /*
438 * Weight contributed by tasks; this is the part we can
439 * influence by moving tasks around.
440 */
441 unsigned long task_weight;
442 } aggregate; 436 } aggregate;
443#endif 437#endif
444#endif 438#endif
@@ -1473,10 +1467,6 @@ static int task_hot(struct task_struct *p, u64 now, struct sched_domain *sd);
1473 * rq_weight: 1467 * rq_weight:
1474 * Direct sum of all the cpu's their rq weight, e.g. A would get 3 while 1468 * Direct sum of all the cpu's their rq weight, e.g. A would get 3 while
1475 * B would get 2. 1469 * B would get 2.
1476 *
1477 * task_weight:
1478 * Part of the rq_weight contributed by tasks; all groups except B would
1479 * get 1, B gets 2.
1480 */ 1470 */
1481 1471
1482static inline struct aggregate_struct * 1472static inline struct aggregate_struct *
@@ -1524,16 +1514,12 @@ static void
1524aggregate_group_weight(struct task_group *tg, int cpu, struct sched_domain *sd) 1514aggregate_group_weight(struct task_group *tg, int cpu, struct sched_domain *sd)
1525{ 1515{
1526 unsigned long rq_weight = 0; 1516 unsigned long rq_weight = 0;
1527 unsigned long task_weight = 0;
1528 int i; 1517 int i;
1529 1518
1530 for_each_cpu_mask(i, sd->span) { 1519 for_each_cpu_mask(i, sd->span)
1531 rq_weight += tg->cfs_rq[i]->load.weight; 1520 rq_weight += tg->cfs_rq[i]->load.weight;
1532 task_weight += tg->cfs_rq[i]->task_weight;
1533 }
1534 1521
1535 aggregate(tg, cpu)->rq_weight = rq_weight; 1522 aggregate(tg, cpu)->rq_weight = rq_weight;
1536 aggregate(tg, cpu)->task_weight = task_weight;
1537} 1523}
1538 1524
1539/* 1525/*