diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2021-12-20 17:20:14 +0100 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2021-12-20 17:50:51 +0100 |
| commit | 6692c98c7df53502adb8b8b73ab9bcbd399f7a06 (patch) | |
| tree | a4f0e5eaff118a71b726e2aa0675568fab9ac8e5 /kernel/fork.c | |
| parent | objtool: Add a missing comma to avoid string concatenation (diff) | |
| download | linux-6692c98c7df53502adb8b8b73ab9bcbd399f7a06.tar.xz linux-6692c98c7df53502adb8b8b73ab9bcbd399f7a06.zip | |
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: 40966e316f86 ("kthread: Ensure struct kthread is present for all kthreads")
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 04fa3e5d97af..23ad62965fbf 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -2464,8 +2464,8 @@ bad_fork_cleanup_policy: lockdep_free_task(p); #ifdef CONFIG_NUMA mpol_put(p->mempolicy); -bad_fork_cleanup_threadgroup_lock: #endif +bad_fork_cleanup_threadgroup_lock: delayacct_tsk_free(p); bad_fork_cleanup_count: dec_rlimit_ucounts(task_ucounts(p), UCOUNT_RLIMIT_NPROC, 1); |