aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Galbraith <efault@gmx.de>2008-04-29 06:23:09 -0400
committerIngo Molnar <mingo@elte.hu>2008-05-05 17:56:18 -0400
commitd7dcdc11cfa6a8860a29b09f985467b89224699d (patch)
treecd7b8c1ba9b23ec84f93e58417e67644dfd7a124
parent673a90a1e05c8127886f7659d1a457169378371f (diff)
sched: fix debugging
Revert debugging commit 7ba2e74ab5a0518bc953042952dd165724bc70c9. print_cfs_rq_tasks() can induce live-lock if a task is dequeued during list traversal. Signed-off-by: Mike Galbraith <efault@gmx.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--kernel/sched_fair.c27
1 files changed, 0 insertions, 27 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 1d5f35b4636e..d99e01f6929a 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -1613,30 +1613,6 @@ static const struct sched_class fair_sched_class = {
1613}; 1613};
1614 1614
1615#ifdef CONFIG_SCHED_DEBUG 1615#ifdef CONFIG_SCHED_DEBUG
1616static void
1617print_cfs_rq_tasks(struct seq_file *m, struct cfs_rq *cfs_rq, int depth)
1618{
1619 struct sched_entity *se;
1620
1621 if (!cfs_rq)
1622 return;
1623
1624 list_for_each_entry_rcu(se, &cfs_rq->tasks, group_node) {
1625 int i;
1626
1627 for (i = depth; i; i--)
1628 seq_puts(m, " ");
1629
1630 seq_printf(m, "%lu %s %lu\n",
1631 se->load.weight,
1632 entity_is_task(se) ? "T" : "G",
1633 calc_delta_weight(SCHED_LOAD_SCALE, se)
1634 );
1635 if (!entity_is_task(se))
1636 print_cfs_rq_tasks(m, group_cfs_rq(se), depth + 1);
1637 }
1638}
1639
1640static void print_cfs_stats(struct seq_file *m, int cpu) 1616static void print_cfs_stats(struct seq_file *m, int cpu)
1641{ 1617{
1642 struct cfs_rq *cfs_rq; 1618 struct cfs_rq *cfs_rq;
@@ -1644,9 +1620,6 @@ static void print_cfs_stats(struct seq_file *m, int cpu)
1644 rcu_read_lock(); 1620 rcu_read_lock();
1645 for_each_leaf_cfs_rq(cpu_rq(cpu), cfs_rq) 1621 for_each_leaf_cfs_rq(cpu_rq(cpu), cfs_rq)
1646 print_cfs_rq(m, cpu, cfs_rq); 1622 print_cfs_rq(m, cpu, cfs_rq);
1647
1648 seq_printf(m, "\nWeight tree:\n");
1649 print_cfs_rq_tasks(m, &cpu_rq(cpu)->cfs, 1);
1650 rcu_read_unlock(); 1623 rcu_read_unlock();
1651} 1624}
1652#endif 1625#endif