Commit 5ca62d65 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

revert "cpumask: don't perform while loop in cpumask_next_and()"

Revert commit 534b483a ("cpumask: don't perform while loop in
cpumask_next_and()").

This was a minor optimization, but it puts a `struct cpumask' on the
stack, which consumes too much stack space.

Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Reported-by: default avatarPeter Zijlstra <peterz@infradead.org>
Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Amir Vadai <amirv@mellanox.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 17fda38f
...@@ -16,11 +16,10 @@ ...@@ -16,11 +16,10 @@
int cpumask_next_and(int n, const struct cpumask *src1p, int cpumask_next_and(int n, const struct cpumask *src1p,
const struct cpumask *src2p) const struct cpumask *src2p)
{ {
struct cpumask tmp; while ((n = cpumask_next(n, src1p)) < nr_cpu_ids)
if (cpumask_test_cpu(n, src2p))
if (cpumask_and(&tmp, src1p, src2p)) break;
return cpumask_next(n, &tmp); return n;
return nr_cpu_ids;
} }
EXPORT_SYMBOL(cpumask_next_and); EXPORT_SYMBOL(cpumask_next_and);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment