diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2015-06-18 20:01:11 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-19 05:00:23 +0200 |
| commit | 5ca62d65030d8295f54c490d2072563545dbd9d9 (patch) | |
| tree | 1066a7809df4d33cf64220a9358993d9050b4690 /lib/cpumask.c | |
| parent | Merge tag 'trace-fix-filter-4.1-rc8' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| download | linux-5ca62d65030d8295f54c490d2072563545dbd9d9.tar.xz linux-5ca62d65030d8295f54c490d2072563545dbd9d9.zip | |
revert "cpumask: don't perform while loop in cpumask_next_and()"
Revert commit 534b483a86e6 ("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: Peter 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'lib/cpumask.c')
| -rw-r--r-- | lib/cpumask.c | 9 |
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); |