diff options
| author | Tejun Heo <tj@kernel.org> | 2015-12-03 16:22:52 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2015-12-03 16:22:52 +0100 |
| commit | 8075b542cf9f5d8a6afd92b4a940e29a677a7510 (patch) | |
| tree | c2075c5fa70b16d086871edaf94febd954fec073 /kernel/fork.c | |
| parent | cpuset: Replace all instances of time_t with time64_t (diff) | |
| parent | cgroup_pids: don't account for the root cgroup (diff) | |
| download | linux-8075b542cf9f5d8a6afd92b4a940e29a677a7510.tar.xz linux-8075b542cf9f5d8a6afd92b4a940e29a677a7510.zip | |
Merge branch 'for-4.4-fixes' into for-4.5
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index f97f2c449f5c..fce002ee3ddf 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1368,8 +1368,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, p->real_start_time = ktime_get_boot_ns(); p->io_context = NULL; p->audit_context = NULL; - if (clone_flags & CLONE_THREAD) - threadgroup_change_begin(current); + threadgroup_change_begin(current); cgroup_fork(p); #ifdef CONFIG_NUMA p->mempolicy = mpol_dup(p->mempolicy); @@ -1610,8 +1609,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, proc_fork_connector(p); cgroup_post_fork(p, cgrp_ss_priv); - if (clone_flags & CLONE_THREAD) - threadgroup_change_end(current); + threadgroup_change_end(current); perf_event_fork(p); trace_task_newtask(p, clone_flags); @@ -1652,8 +1650,7 @@ bad_fork_cleanup_policy: mpol_put(p->mempolicy); bad_fork_cleanup_threadgroup_lock: #endif - if (clone_flags & CLONE_THREAD) - threadgroup_change_end(current); + threadgroup_change_end(current); delayacct_tsk_free(p); bad_fork_cleanup_count: atomic_dec(&p->cred->user->processes); |