1 files changed, 5 insertions, 4 deletions

diff --git a/lib/cpumask.c b/lib/cpumask.c
index b6513a9f2892..5ab1553fd076 100644
--- a/lib/cpumask.c
+++ b/lib/cpumask.c
@@ -37,10 +37,11 @@ EXPORT_SYMBOL(__next_cpu_nr);
 int cpumask_next_and(int n, const struct cpumask *src1p,
                      const struct cpumask *src2p)
 {
-        while ((n = cpumask_next(n, src1p)) < nr_cpu_ids)
-                if (cpumask_test_cpu(n, src2p))
-                        break;
-        return n;
+        struct cpumask tmp;
+
+        if (cpumask_and(&tmp, src1p, src2p))
+                return cpumask_next(n, &tmp);
+        return nr_cpu_ids;
 }
 EXPORT_SYMBOL(cpumask_next_and);