Commit 6692c98c authored by Eric W. Biederman's avatar Eric W. Biederman

fork: Stop protecting back_fork_cleanup_cgroup_lock with CONFIG_NUMA

Mark Brown <broonie@kernel.org> reported:

> This is also causing further build errors including but not limited to:
>
> /tmp/next/build/kernel/fork.c: In function 'copy_process':
> /tmp/next/build/kernel/fork.c:2106:4: error: label 'bad_fork_cleanup_threadgroup_lock' used but not defined
>  2106 |    goto bad_fork_cleanup_threadgroup_lock;
>       |    ^~~~

It turns out that I messed up and was depending upon a label protected
by an ifdef.  Move the label out of the ifdef as the ifdef around the label
no longer makes sense (if it ever did).

Link: https://lkml.kernel.org/r/YbugCP144uxXvRsk@sirena.org.uk
Fixes: 40966e31 ("kthread: Ensure struct kthread is present for all kthreads")
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent 1fb466df
...@@ -2464,8 +2464,8 @@ static __latent_entropy struct task_struct *copy_process( ...@@ -2464,8 +2464,8 @@ static __latent_entropy struct task_struct *copy_process(
lockdep_free_task(p); lockdep_free_task(p);
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
mpol_put(p->mempolicy); mpol_put(p->mempolicy);
bad_fork_cleanup_threadgroup_lock:
#endif #endif
bad_fork_cleanup_threadgroup_lock:
delayacct_tsk_free(p); delayacct_tsk_free(p);
bad_fork_cleanup_count: bad_fork_cleanup_count:
dec_rlimit_ucounts(task_ucounts(p), UCOUNT_RLIMIT_NPROC, 1); dec_rlimit_ucounts(task_ucounts(p), UCOUNT_RLIMIT_NPROC, 1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment