]> git.baikalelectronics.ru Git - kernel.git/commitdiff
fork: Stop protecting back_fork_cleanup_cgroup_lock with CONFIG_NUMA
authorEric W. Biederman <ebiederm@xmission.com>
Mon, 20 Dec 2021 16:20:14 +0000 (10:20 -0600)
committerEric W. Biederman <ebiederm@xmission.com>
Mon, 20 Dec 2021 16:50:51 +0000 (10:50 -0600)
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: aa52bf4ac30d ("kthread: Ensure struct kthread is present for all kthreads")
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
kernel/fork.c

index 04fa3e5d97af1298b4d0acacf8eab562f0a768a4..23ad62965fbf3cc10f66a9be040d13dc00c99d8f 100644 (file)
@@ -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);