summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Galbraith <efault@gmx.de>2012-08-07 05:00:13 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-14 10:00:20 -0700
commit0f342b96d471d48fb151ae9073e58e0510e0a58f (patch)
tree58a1e4265c0a36975e487b02027915274ee701bc
parent3465c32ced49e3c04b7e280843f1a93ec8de8aff (diff)
downloadlinux-3.10-0f342b96d471d48fb151ae9073e58e0510e0a58f.tar.gz
linux-3.10-0f342b96d471d48fb151ae9073e58e0510e0a58f.tar.bz2
linux-3.10-0f342b96d471d48fb151ae9073e58e0510e0a58f.zip
sched,cgroup: Fix up task_groups list
commit 35cf4e50b16331def6cfcbee11e49270b6db07f5 upstream. With multiple instances of task_groups, for_each_rt_rq() is a noop, no task groups having been added to the rt.c list instance. This renders __enable/disable_runtime() and print_rt_stats() noop, the user (non) visible effect being that rt task groups are missing in /proc/sched_debug. Signed-off-by: Mike Galbraith <efault@gmx.de> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1344308413.6846.7.camel@marge.simpson.net Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--kernel/sched/core.c1
-rw-r--r--kernel/sched/sched.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 817bf701883..f70b975c85a 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -7011,6 +7011,7 @@ int in_sched_functions(unsigned long addr)
#ifdef CONFIG_CGROUP_SCHED
struct task_group root_task_group;
+LIST_HEAD(task_groups);
#endif
DECLARE_PER_CPU(cpumask_var_t, load_balance_tmpmask);
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 116ced06ecc..d9637f4c43d 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -80,7 +80,7 @@ extern struct mutex sched_domains_mutex;
struct cfs_rq;
struct rt_rq;
-static LIST_HEAD(task_groups);
+extern struct list_head task_groups;
struct cfs_bandwidth {
#ifdef CONFIG_CFS_BANDWIDTH