Commit 5584e8ac authored by Waiman Long's avatar Waiman Long Committed by Peter Zijlstra

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: default avatarWaiman Long <longman@redhat.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20220922180041.1768141-2-longman@redhat.com
parent ad841e56
...@@ -2690,6 +2690,8 @@ void release_user_cpus_ptr(struct task_struct *p) ...@@ -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, static int affine_move_task(struct rq *rq, struct task_struct *p, struct rq_flags *rf,
int dest_cpu, unsigned int flags) int dest_cpu, unsigned int flags)
__releases(rq->lock)
__releases(p->pi_lock)
{ {
struct set_affinity_pending my_pending = { }, *pending = NULL; struct set_affinity_pending my_pending = { }, *pending = NULL;
bool stop_pending, complete = false; bool stop_pending, complete = false;
...@@ -2999,7 +3001,7 @@ static int restrict_cpus_allowed_ptr(struct task_struct *p, ...@@ -2999,7 +3001,7 @@ static int restrict_cpus_allowed_ptr(struct task_struct *p,
/* /*
* Restrict the CPU affinity of task @p so that it is a subset of * 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 * old affinity mask. If the resulting mask is empty, we warn and walk
* up the cpuset hierarchy until we find a suitable mask. * up the cpuset hierarchy until we find a suitable mask.
*/ */
......
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