Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a1e6a8d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "sched/core: Keep rq online after cpu isolation"

parents b820fbcd 34a3cdf1
Loading
Loading
Loading
Loading
+7 −5
Original line number Diff line number Diff line
@@ -5573,15 +5573,21 @@ int do_isolation_work_cpu_stop(void *data)

	sched_ttwu_pending();

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

	/*
	 * Temporarily mark the rq as offline. This will allow us to
	 * move tasks off the CPU.
	 */
	if (rq->rd) {
		BUG_ON(!cpumask_test_cpu(cpu, rq->rd->span));
		set_rq_offline(rq);
	}

	migrate_tasks(rq, false);

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

	/*
@@ -5741,10 +5747,6 @@ int sched_unisolate_cpu_unlocked(int cpu)

		raw_spin_lock_irqsave(&rq->lock, flags);
		rq->age_stamp = sched_clock_cpu(cpu);
		if (rq->rd) {
			BUG_ON(!cpumask_test_cpu(cpu, rq->rd->span));
			set_rq_online(rq);
		}
		raw_spin_unlock_irqrestore(&rq->lock, flags);
	}