1 files changed, 4 insertions, 5 deletions

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