From 0625514c820de97ebb01ae565506629465ffb9cd Mon Sep 17 00:00:00 2001 From: Bharata B Rao Date: Tue, 11 Jan 2011 15:42:57 +0530 Subject: [PATCH] --- yaml --- r: 231999 b: refs/heads/master c: 8ecedd7a06d27a31dbb36fab88e2ba6e6edd43ca h: refs/heads/master i: 231997: f659081244edc9bdc6e921592f31cf325d292cc9 231995: 1d18a9456ee7329407b2513104cc19a56cd9b953 231991: e80c0de0f19520b7c8d06804c1a4d332c13a3d4d 231983: ceea30f36aa726d2dd2f1fe3bc6c7e4225af0140 231967: 9101657dd0207d5318a65618eaddac301ea0d706 231935: 4a03a5f169e1c73ca055a1eb2135a5a24cde88a9 v: v3 --- [refs] | 2 +- trunk/kernel/sched_autogroup.c | 5 +++++ trunk/kernel/sched_debug.c | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f5db6b76405c..f2eadd4496e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: efe25c2c7b3a5d17b0c70987a758d8fe7af8e3d1 +refs/heads/master: 8ecedd7a06d27a31dbb36fab88e2ba6e6edd43ca diff --git a/trunk/kernel/sched_autogroup.c b/trunk/kernel/sched_autogroup.c index 32a723b8f84c..938d52f80a2d 100644 --- a/trunk/kernel/sched_autogroup.c +++ b/trunk/kernel/sched_autogroup.c @@ -231,6 +231,11 @@ void proc_sched_autogroup_show_task(struct task_struct *p, struct seq_file *m) #ifdef CONFIG_SCHED_DEBUG static inline int autogroup_path(struct task_group *tg, char *buf, int buflen) { + int enabled = ACCESS_ONCE(sysctl_sched_autogroup_enabled); + + if (!enabled || !tg->autogroup) + return 0; + return snprintf(buf, buflen, "%s-%ld", "/autogroup", tg->autogroup->id); } #endif /* CONFIG_SCHED_DEBUG */ diff --git a/trunk/kernel/sched_debug.c b/trunk/kernel/sched_debug.c index 4d36f3726da7..e4d37259d490 100644 --- a/trunk/kernel/sched_debug.c +++ b/trunk/kernel/sched_debug.c @@ -93,6 +93,9 @@ static char group_path[PATH_MAX]; static char *task_group_path(struct task_group *tg) { + if (autogroup_path(tg, group_path, PATH_MAX)) + return group_path; + /* * May be NULL if the underlying cgroup isn't fully-created yet */