X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=lib%2Fcpumask.c;h=5a70f6196f577a071ae0a31e9da7fa0e1dd1bc68;hb=43224b96af3154cedd7220f7b90094905f07ac78;hp=5f627084f2e998b2605016c311411d91f7016918;hpb=f407a8258610169cd8e975dba7f0b2824562014c;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

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);