---

yaml --- r: 231999 b: refs/heads/master c: 8ecedd7 h: refs/heads/master i: 231997: f659081 231995: 1d18a94 231991: e80c0de 231983: ceea30f 231967: 9101657 231935: 4a03a5f v: v3
git-mirror · Jan 18, 2011 · 0625514 · 0625514
1 parent f643ba8
commit 0625514
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
 	 */