diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-12-11 10:23:45 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-12-11 10:23:45 +0100 |
| commit | c1ad41f1f7270c1956da13fa8fd59d8d5929d56e (patch) | |
| tree | 2a9812fe4a5bee0f354273c34411e00e94746b64 /kernel/sched/auto_group.h | |
| parent | Merge tag 'sched-cputime-for-mingo' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| download | linux-c1ad41f1f7270c1956da13fa8fd59d8d5929d56e.tar.xz linux-c1ad41f1f7270c1956da13fa8fd59d8d5929d56e.zip | |
Revert "sched/autogroup: Fix crash on reboot when autogroup is disabled"
This reverts commit 5258f386ea4e8454bc801fb443e8a4217da1947c,
because the underlying autogroups bug got fixed upstream in
a better way, via:
fd8ef11730f1 Revert "sched, autogroup: Stop going ahead if autogroup is disabled"
Cc: Mike Galbraith <efault@gmx.de>
Cc: Yong Zhang <yong.zhang0@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
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, 8 insertions, 1 deletions
diff --git a/kernel/sched/auto_group.h b/kernel/sched/auto_group.h index 4552c6bf79d2..8bd047142816 100644 --- a/kernel/sched/auto_group.h +++ b/kernel/sched/auto_group.h @@ -4,6 +4,11 @@ #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; @@ -24,7 +29,9 @@ 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) { - if (task_wants_autogroup(p, tg)) + int enabled = ACCESS_ONCE(sysctl_sched_autogroup_enabled); + + if (enabled && task_wants_autogroup(p, tg)) return p->signal->autogroup->tg; return tg; |