1 files changed, 2 insertions, 6 deletions

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 58edbbdeb661..0692c8ff6ff6 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -9615,7 +9615,7 @@ static void nohz_balancer_kick(struct rq *rq)
         sd = rcu_dereference(rq->sd);
         if (sd) {
                 if ((rq->cfs.h_nr_running >= 1) &&
-                                check_cpu_capacity(rq, sd)) {
+                    check_cpu_capacity(rq, sd)) {
                         flags = NOHZ_KICK_MASK;
                         goto unlock;
                 }
@@ -9623,11 +9623,7 @@ static void nohz_balancer_kick(struct rq *rq)
 
         sd = rcu_dereference(per_cpu(sd_asym_packing, cpu));
         if (sd) {
-                for_each_cpu(i, sched_domain_span(sd)) {
-                        if (i == cpu ||
-                            !cpumask_test_cpu(i, nohz.idle_cpus_mask))
-                                continue;
-
+                for_each_cpu_and(i, sched_domain_span(sd), nohz.idle_cpus_mask) {
                         if (sched_asym_prefer(i, cpu)) {
                                 flags = NOHZ_KICK_MASK;
                                 goto unlock;