Re: [git pull] scheduler changes for v2.6.26

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Peter Zijlstra
Date: Wednesday, April 23, 2008 - 4:21 am

On Wed, 2008-04-23 at 12:30 +0200, Mike Galbraith wrote:


Sorry about that :-/

this should fix it:

---
Subject: sched: fix oops

sched_debug uses SEQ_printf to use printk when the seqfile 'm' is NULL.
Instead of doing that here too; choose to not output the weight tree
to cut back on output.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 89fa32b..353a481 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -1643,8 +1643,10 @@ static void print_cfs_stats(struct seq_file *m, int cpu)
 	for_each_leaf_cfs_rq(cpu_rq(cpu), cfs_rq)
 		print_cfs_rq(m, cpu, cfs_rq);
 
-	seq_printf(m, "\nWeight tree:\n");
-	print_cfs_rq_tasks(m, &cpu_rq(cpu)->cfs, 1);
+	if (m) {
+		seq_printf(m, "\nWeight tree:\n");
+		print_cfs_rq_tasks(m, &cpu_rq(cpu)->cfs, 1);
+	}
 	rcu_read_unlock();
 }
 #endif


--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[git pull] scheduler changes for v2.6.26, Ingo Molnar, (Sat Apr 19, 11:13 am)
Re: [git pull] scheduler changes for v2.6.26, Guillaume Chazarain, (Sat Apr 19, 11:47 am)
Re: [git pull] scheduler changes for v2.6.26, Ingo Molnar, (Sat Apr 19, 11:49 am)
Re: [git pull] scheduler changes for v2.6.26, Peter Zijlstra, (Sat Apr 19, 11:54 am)
Re: [git pull] scheduler changes for v2.6.26, Frans Pop, (Sat Apr 19, 12:47 pm)
Re: [git pull] scheduler changes for v2.6.26, Ingo Molnar, (Mon Apr 21, 5:39 am)
Re: [git pull] scheduler changes for v2.6.26, Frans Pop, (Mon Apr 21, 9:31 am)
Re: [git pull] scheduler changes for v2.6.26, Ingo Molnar, (Mon Apr 21, 12:43 pm)
Re: [git pull] scheduler changes for v2.6.26, Mike Galbraith, (Tue Apr 22, 1:51 am)
Re: [git pull] scheduler changes for v2.6.26, Ingo Molnar, (Tue Apr 22, 1:59 am)
Re: [git pull] scheduler changes for v2.6.26, Kevin Winchester, (Tue Apr 22, 2:41 am)
Re: [git pull] scheduler changes for v2.6.26, Peter Zijlstra, (Tue Apr 22, 2:59 am)
Re: [git pull] scheduler changes for v2.6.26, David Miller, (Tue Apr 22, 3:49 am)
Re: [git pull] scheduler changes for v2.6.26, Peter Zijlstra, (Tue Apr 22, 4:10 am)
Re: [git pull] scheduler changes for v2.6.26, Mike Galbraith, (Tue Apr 22, 5:25 am)
Re: [git pull] scheduler changes for v2.6.26, Mike Galbraith, (Wed Apr 23, 1:11 am)
Re: [git pull] scheduler changes for v2.6.26, Frans Pop, (Wed Apr 23, 2:36 am)
Re: [git pull] scheduler changes for v2.6.26, Peter Zijlstra, (Wed Apr 23, 2:42 am)
Re: [git pull] scheduler changes for v2.6.26, Ingo Molnar, (Wed Apr 23, 2:46 am)
Re: [git pull] scheduler changes for v2.6.26, Mike Galbraith, (Wed Apr 23, 3:30 am)
Re: [git pull] scheduler changes for v2.6.26, Peter Zijlstra, (Wed Apr 23, 4:21 am)
Re: [git pull] scheduler changes for v2.6.26, Mike Galbraith, (Wed Apr 23, 6:27 am)
Re: [git pull] scheduler changes for v2.6.26, Frans Pop, (Wed Apr 23, 6:36 am)
Re: [git pull] scheduler changes for v2.6.26, Frans Pop, (Wed Apr 23, 9:23 am)
Re: [git pull] scheduler changes for v2.6.26, Ingo Molnar, (Tue Apr 29, 5:29 am)
Re: [git pull] scheduler changes for v2.6.26, Steven Rostedt, (Tue Apr 29, 8:28 am)