From 845834fca940465d3fa363d0db0823bff3ef6923 Mon Sep 17 00:00:00 2001 From: Sai Harshini Nimmala Date: Thu, 22 Sep 2022 16:49:46 -0700 Subject: [PATCH] sched/walt: Expand rq_relock() The rq_relock() function is removed upstream. Replace all instances of it by expanding the function. Change-Id: I7b99d46d552695ae0afdf75f3a6033b80376fe01 Signed-off-by: Sai Harshini Nimmala --- kernel/sched/walt/walt_halt.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kernel/sched/walt/walt_halt.c b/kernel/sched/walt/walt_halt.c index a6f33d5b7cde..756d455fca87 100644 --- a/kernel/sched/walt/walt_halt.c +++ b/kernel/sched/walt/walt_halt.c @@ -137,7 +137,8 @@ static void migrate_tasks(struct rq *dead_rq, struct rq_flags *rf) */ rq_unlock(rq, rf); raw_spin_lock(&next->pi_lock); - rq_relock(rq, rf); + raw_spin_rq_lock(rq); + rq_repin_lock(rq, rf); /* * Since we're inside stop-machine, _nothing_ should have @@ -160,7 +161,8 @@ static void migrate_tasks(struct rq *dead_rq, struct rq_flags *rf) rq_unlock(rq, rf); rq = dead_rq; *rf = orf; - rq_relock(rq, rf); + raw_spin_rq_lock(rq); + rq_repin_lock(rq, rf); } } else { detach_one_task_core(next, rq, &percpu_kthreads);