Merge "Revert "sched/deadline: Remove cpu_active_mask from cpudl_find()"" (af1bdb0e) · Commits · e / devices / android_kernel_oneplus_sm7250

kernel/sched/cpudeadline.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -124,7 +124,8 @@ int cpudl_find(struct cpudl cp, struct task_struct p,
		const struct sched_dl_entity *dl_se = &p->dl;

		if (later_mask &&
		cpumask_and(later_mask, cp->free_cpus, &p->cpus_allowed)) {
		cpumask_and(later_mask, cp->free_cpus, &p->cpus_allowed) &&
		cpumask_and(later_mask, later_mask, cpu_active_mask)) {
		return 1;
		} else {
		int best_cpu = cpudl_maximum(cp);
		@@ -132,6 +133,7 @@ int cpudl_find(struct cpudl cp, struct task_struct p,
		WARN_ON(best_cpu != -1 && !cpu_present(best_cpu));

		if (cpumask_test_cpu(best_cpu, &p->cpus_allowed) &&
		cpumask_test_cpu(best_cpu, cpu_active_mask) &&
		dl_time_before(dl_se->deadline, cp->elements[0].dl)) {
		if (later_mask)
		cpumask_set_cpu(best_cpu, later_mask);