diff options
| author | David S. Miller <davem@davemloft.net> | 2015-12-05 22:47:11 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-12-05 22:47:11 -0500 |
| commit | a90099d9fabd2458084b9c2b79f1a62d9b76a61a (patch) | |
| tree | b5e63e301846c04d23f4cfc2386f5bebfbe9802b /lib/rhashtable.c | |
| parent | 8e6569af3a1b8264c37a2c93a37bef48eb300160 (diff) | |
| download | linux-a90099d9fabd2458084b9c2b79f1a62d9b76a61a.tar.bz2 | |
Revert "rhashtable: Use __vmalloc with GFP_ATOMIC for table allocation"
This reverts commit d3716f18a7d841565c930efde30737a3557eee69.
vmalloc cannot be used in BH disabled contexts, even
with GFP_ATOMIC. And we certainly want to support
rhashtable users inserting entries with software
interrupts disabled.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib/rhashtable.c')
| -rw-r--r-- | lib/rhashtable.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/rhashtable.c b/lib/rhashtable.c index 1c624db90e88..2ff7ed91663a 100644 --- a/lib/rhashtable.c +++ b/lib/rhashtable.c @@ -120,9 +120,8 @@ static struct bucket_table *bucket_table_alloc(struct rhashtable *ht, if (size <= (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER) || gfp != GFP_KERNEL) tbl = kzalloc(size, gfp | __GFP_NOWARN | __GFP_NORETRY); - if (tbl == NULL) - tbl = __vmalloc(size, gfp | __GFP_HIGHMEM | __GFP_ZERO, - PAGE_KERNEL); + if (tbl == NULL && gfp == GFP_KERNEL) + tbl = vzalloc(size); if (tbl == NULL) return NULL; |