summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorWaiman Long <longman@redhat.com>2022-09-22 14:00:37 -0400
committerPeter Zijlstra <peterz@infradead.org>2022-10-27 11:01:21 +0200
commit5584e8ac2c68280e5ac31d231c23cdb7dfa225db (patch)
tree58ba1442b5394d8c19a861267222a7b94cf24e7e /kernel
parentad841e569f5c88e3332b32a000f251f33ff32187 (diff)
downloadlinux-stable-5584e8ac2c68280e5ac31d231c23cdb7dfa225db.tar.gz
linux-stable-5584e8ac2c68280e5ac31d231c23cdb7dfa225db.tar.bz2
linux-stable-5584e8ac2c68280e5ac31d231c23cdb7dfa225db.zip
sched: Add __releases annotations to affine_move_task()
affine_move_task() assumes task_rq_lock() has been called and it does an implicit task_rq_unlock() before returning. Add the appropriate __releases annotations to make this clear. A typo error in comment is also fixed. Signed-off-by: Waiman Long <longman@redhat.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lkml.kernel.org/r/20220922180041.1768141-2-longman@redhat.com
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched/core.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 069da4a7ab72..f6f2807e17ba 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -2690,6 +2690,8 @@ void release_user_cpus_ptr(struct task_struct *p)
*/
static int affine_move_task(struct rq *rq, struct task_struct *p, struct rq_flags *rf,
int dest_cpu, unsigned int flags)
+ __releases(rq->lock)
+ __releases(p->pi_lock)
{
struct set_affinity_pending my_pending = { }, *pending = NULL;
bool stop_pending, complete = false;
@@ -2999,7 +3001,7 @@ err_unlock:
/*
* Restrict the CPU affinity of task @p so that it is a subset of
- * task_cpu_possible_mask() and point @p->user_cpu_ptr to a copy of the
+ * task_cpu_possible_mask() and point @p->user_cpus_ptr to a copy of the
* old affinity mask. If the resulting mask is empty, we warn and walk
* up the cpuset hierarchy until we find a suitable mask.
*/