diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-11-18 09:34:44 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-11-18 09:34:44 +0100 |
| commit | ec05a2311c35243cea08bca00bcf53a576ee41a2 (patch) | |
| tree | b6feae6520bdeeb40f5c08e509b108d84199db7b /kernel/sched/auto_group.h | |
| parent | a7a0aaa17ace589897021d668e09d474e7fc4c4d (diff) | |
| parent | 5258f386ea4e8454bc801fb443e8a4217da1947c (diff) | |
Merge branch 'sched/urgent' into sched/core
Merge in fixes before we queue up dependent bits, to avoid conflicts.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/auto_group.h')
| -rw-r--r-- | kernel/sched/auto_group.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/kernel/sched/auto_group.h b/kernel/sched/auto_group.h index 8bd047142816..4552c6bf79d2 100644 --- a/kernel/sched/auto_group.h +++ b/kernel/sched/auto_group.h @@ -4,11 +4,6 @@ #include <linux/rwsem.h> struct autogroup { - /* - * reference doesn't mean how many thread attach to this - * autogroup now. It just stands for the number of task - * could use this autogroup. - */ struct kref kref; struct task_group *tg; struct rw_semaphore lock; @@ -29,9 +24,7 @@ extern bool task_wants_autogroup(struct task_struct *p, struct task_group *tg); static inline struct task_group * autogroup_task_group(struct task_struct *p, struct task_group *tg) { - int enabled = ACCESS_ONCE(sysctl_sched_autogroup_enabled); - - if (enabled && task_wants_autogroup(p, tg)) + if (task_wants_autogroup(p, tg)) return p->signal->autogroup->tg; return tg; |