summaryrefslogtreecommitdiffstats
path: root/include/linux/sched.h
diff options
context:
space:
mode:
authorIngo Molnar2015-10-06 17:05:36 +0200
committerIngo Molnar2015-10-06 17:05:36 +0200
commitfe19159225d8516f3f57a5fe8f735c01684f0ddd (patch)
tree1a41faa5ef5139485f4afabd6bb9d3977c0a115b /include/linux/sched.h
parentsched/core: Make 'sched_domain_topology' declaration static (diff)
parentsched/core: Fix TASK_DEAD race in finish_task_switch() (diff)
downloadkernel-qcow2-linux-fe19159225d8516f3f57a5fe8f735c01684f0ddd.tar.gz
kernel-qcow2-linux-fe19159225d8516f3f57a5fe8f735c01684f0ddd.tar.xz
kernel-qcow2-linux-fe19159225d8516f3f57a5fe8f735c01684f0ddd.zip
Merge branch 'sched/urgent' into sched/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r--include/linux/sched.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 699228bb0035..d086cf0ca2c7 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -762,6 +762,18 @@ struct signal_struct {
unsigned audit_tty_log_passwd;
struct tty_audit_buf *tty_audit_buf;
#endif
+#ifdef CONFIG_CGROUPS
+ /*
+ * group_rwsem prevents new tasks from entering the threadgroup and
+ * member tasks from exiting,a more specifically, setting of
+ * PF_EXITING. fork and exit paths are protected with this rwsem
+ * using threadgroup_change_begin/end(). Users which require
+ * threadgroup to remain stable should use threadgroup_[un]lock()
+ * which also takes care of exec path. Currently, cgroup is the
+ * only user.
+ */
+ struct rw_semaphore group_rwsem;
+#endif
oom_flags_t oom_flags;
short oom_score_adj; /* OOM kill score adjustment */