From e560954645e9d02e09cb45323a9908ef70cd9c1d Mon Sep 17 00:00:00 2001 From: Quentin Perret Date: Tue, 15 Dec 2020 17:55:55 +0000 Subject: [PATCH] Revert "ANDROID: sched/rt: cpu_active_mask intersection" This reverts commit b05fe6b580b0aa6b9be16b80195f338ffc896b96. CPU Pause causes major merge conflicts with the 5.11 scheduler changes (migrate-disable specifically), so lets revert Pause temporarily as it is not needed urgently in android-mainline. Signed-off-by: Quentin Perret Change-Id: Ib6b8b3a803fe4035acd0d70fbf448280e4e930cb --- kernel/sched/cpupri.c | 1 - 1 file changed, 1 deletion(-) diff --git a/kernel/sched/cpupri.c b/kernel/sched/cpupri.c index 46347aaf5c1b..69bc0de4d2eb 100644 --- a/kernel/sched/cpupri.c +++ b/kernel/sched/cpupri.c @@ -99,7 +99,6 @@ static inline int __cpupri_find(struct cpupri *cp, struct task_struct *p, if (lowest_mask) { cpumask_and(lowest_mask, p->cpus_ptr, vec->mask); - cpumask_and(lowest_mask, lowest_mask, cpu_active_mask); #ifdef CONFIG_RT_SOFTINT_OPTIMIZATION if (drop_nopreempts)