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

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

Merge "sched: let sched_boost take precedence over sched_restrict_cluster_spill"

parents 0132c779 03228758

kernel/sched/fair.c

+1 −1
Original line number Diff line number Diff line
@@ -9754,7 +9754,7 @@ static inline int _nohz_kick_needed_hmp(struct rq *rq, int cpu, int *type) 
	if (rq->nr_running < 2)

		return 0;



	if (!sysctl_sched_restrict_cluster_spill)

	if (!sysctl_sched_restrict_cluster_spill || sched_boost())

		return 1;



	if (hmp_capable() && cpu_max_possible_capacity(cpu) ==

kernel/sched/rt.c

+2 −1
Original line number Diff line number Diff line
@@ -1657,7 +1657,8 @@ static int find_lowest_rq_hmp(struct task_struct *task) 
	int prev_cpu = task_cpu(task);

	u64 cpu_load, min_load = ULLONG_MAX;

	int i;

	int restrict_cluster = sysctl_sched_restrict_cluster_spill;

	int restrict_cluster = sched_boost() ? 0 :

				sysctl_sched_restrict_cluster_spill;



	/* Make sure the mask is initialized first */

	if (unlikely(!lowest_mask))