diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-23 16:47:12 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-25 09:39:19 +0200 |
| commit | 3152657f104ce9b0f80793c92a745d5e97b43812 (patch) | |
| tree | b720a75f328d16b999f02be8173e0db24ed699cb /lib | |
| parent | b8c1b8ea7b219a7ba6d58d97bfdf1403b741f8d5 (diff) | |
| parent | ba155e2d21f6bf05de86a78dbe5bfd8757604a65 (diff) | |
| download | linux-stable-3152657f104ce9b0f80793c92a745d5e97b43812.tar.gz linux-stable-3152657f104ce9b0f80793c92a745d5e97b43812.tar.bz2 linux-stable-3152657f104ce9b0f80793c92a745d5e97b43812.zip | |
Merge branch 'linus' into x86/fpu
Resolve semantic conflict in arch/x86/kvm/cpuid.c with:
c447e76b4cab ("kvm/fpu: Enable eager restore kvm FPU for MPX")
By removing the FPU internal include files.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rhashtable.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/lib/rhashtable.c b/lib/rhashtable.c index b28df4019ade..4396434e4715 100644 --- a/lib/rhashtable.c +++ b/lib/rhashtable.c @@ -14,6 +14,7 @@ * published by the Free Software Foundation. */ +#include <linux/atomic.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/log2.h> @@ -446,6 +447,10 @@ int rhashtable_insert_slow(struct rhashtable *ht, const void *key, if (key && rhashtable_lookup_fast(ht, key, ht->p)) goto exit; + err = -E2BIG; + if (unlikely(rht_grow_above_max(ht, tbl))) + goto exit; + err = -EAGAIN; if (rhashtable_check_elasticity(ht, tbl, hash) || rht_grow_above_100(ht, tbl)) @@ -738,6 +743,12 @@ int rhashtable_init(struct rhashtable *ht, if (params->max_size) ht->p.max_size = rounddown_pow_of_two(params->max_size); + if (params->insecure_max_entries) + ht->p.insecure_max_entries = + rounddown_pow_of_two(params->insecure_max_entries); + else + ht->p.insecure_max_entries = ht->p.max_size * 2; + ht->p.min_size = max(ht->p.min_size, HASH_MIN_SIZE); /* The maximum (not average) chain length grows with the |