diff options
author | 2010-06-08 20:05:18 -0400 | |
---|---|---|
committer | 2010-06-08 20:05:18 -0400 | |
commit | 44b56603c4c476b845a824cff6fe905c6268b2a1 (patch) | |
tree | b7e792414fef2390718a657765719fbbb529ce84 /kernel/sched_debug.c | |
parent | nfsd4: shut down callback queue outside state lock (diff) | |
parent | nfsd: nfsd_setattr needs to call commit_metadata (diff) | |
download | linux-rng-44b56603c4c476b845a824cff6fe905c6268b2a1.tar.xz linux-rng-44b56603c4c476b845a824cff6fe905c6268b2a1.zip |
Merge branch 'for-2.6.34-incoming' into for-2.6.35-incoming
Diffstat (limited to 'kernel/sched_debug.c')
-rw-r--r-- | kernel/sched_debug.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c index 9b49db144037..19be00ba6123 100644 --- a/kernel/sched_debug.c +++ b/kernel/sched_debug.c @@ -114,7 +114,9 @@ print_task(struct seq_file *m, struct rq *rq, struct task_struct *p) { char path[64]; + rcu_read_lock(); cgroup_path(task_group(p)->css.cgroup, path, sizeof(path)); + rcu_read_unlock(); SEQ_printf(m, " %s", path); } #endif |