Merge "sched: Fix assert_clock_updated warning emitted during CPU isolation" (98a53825) · Commits · e / devices / android_kernel_xiaomi_sm6125

kernel/sched/core.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -5821,6 +5821,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);
		if (!(rq->clock_update_flags & RQCF_UPDATED))
		update_rq_clock(rq);

		/*
		* Since we're inside stop-machine, _nothing_ should have
		@@ -5844,6 +5846,8 @@ static void migrate_tasks(struct rq dead_rq, struct rq_flags rf,
		rq = dead_rq;
		*rf = orf;
		rq_relock(rq, rf);
		if (!(rq->clock_update_flags & RQCF_UPDATED))
		update_rq_clock(rq);
		}
		raw_spin_unlock(&next->pi_lock);
		}
		@@ -5872,7 +5876,7 @@ int do_isolation_work_cpu_stop(void *data)
		sched_ttwu_pending();

		/* Update our root-domain */
		raw_spin_lock(&rq->lock);
		rq_lock(rq, &rf);

		/*
		* Temporarily mark the rq as offline. This will allow us to
		@@ -5887,7 +5891,7 @@ int do_isolation_work_cpu_stop(void *data)

		if (rq->rd)
		set_rq_online(rq);
		raw_spin_unlock(&rq->lock);
		rq_unlock(rq, &rf);

		clear_walt_request(cpu);
		local_irq_enable();