diff options
| author | Greg Kroah-Hartman | 2014-02-18 17:57:10 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-02-18 17:57:10 +0100 |
| commit | 91219a3b20325689eb80f7598cce2dc745db171d (patch) | |
| tree | 0d82f056a6b48e27a126556ac12204c84b728b02 /lib | |
| parent | sysfs: create bin_attributes under the requested group (diff) | |
| parent | Linux 3.14-rc3 (diff) | |
| download | kernel-qcow2-linux-91219a3b20325689eb80f7598cce2dc745db171d.tar.gz kernel-qcow2-linux-91219a3b20325689eb80f7598cce2dc745db171d.tar.xz kernel-qcow2-linux-91219a3b20325689eb80f7598cce2dc745db171d.zip | |
Merge 3.14-rc3 into driver-core-next
We want those fixes here for testing and development.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/percpu_ida.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/percpu_ida.c b/lib/percpu_ida.c index 7be235f1a70b..93d145e5539c 100644 --- a/lib/percpu_ida.c +++ b/lib/percpu_ida.c @@ -54,9 +54,7 @@ static inline void move_tags(unsigned *dst, unsigned *dst_nr, /* * Try to steal tags from a remote cpu's percpu freelist. * - * We first check how many percpu freelists have tags - we don't steal tags - * unless enough percpu freelists have tags on them that it's possible more than - * half the total tags could be stuck on remote percpu freelists. + * We first check how many percpu freelists have tags * * Then we iterate through the cpus until we find some tags - we don't attempt * to find the "best" cpu to steal from, to keep cacheline bouncing to a @@ -69,8 +67,7 @@ static inline void steal_tags(struct percpu_ida *pool, struct percpu_ida_cpu *remote; for (cpus_have_tags = cpumask_weight(&pool->cpus_have_tags); - cpus_have_tags * pool->percpu_max_size > pool->nr_tags / 2; - cpus_have_tags--) { + cpus_have_tags; cpus_have_tags--) { cpu = cpumask_next(cpu, &pool->cpus_have_tags); if (cpu >= nr_cpu_ids) { |