diff options
| author | Rob Herring <robh@kernel.org> | 2015-10-22 09:22:09 -0500 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2015-10-22 09:22:09 -0500 |
| commit | f92ce7618f0cb0ced87ea1cfe994d2e8473c61b4 (patch) | |
| tree | 8589e85799e0de7b1cdf0b4e8f08397eeeb72a74 /kernel/fork.c | |
| parent | 307751ee3212df0d047b0e1a93ce21f2e511d1a1 (diff) | |
| parent | eb3fcf007fffe5830d815e713591f3e858f2a365 (diff) | |
Merge branch 'dt-doc-cleanup' into for-next
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 7d5f0f118a63..2845623fb582 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1149,6 +1149,10 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk) tty_audit_fork(sig); sched_autogroup_fork(sig); +#ifdef CONFIG_CGROUPS + init_rwsem(&sig->group_rwsem); +#endif + sig->oom_score_adj = current->signal->oom_score_adj; sig->oom_score_adj_min = current->signal->oom_score_adj_min; |