|
@@ -211,11 +211,10 @@ static struct bucket_table *bucket_table_alloc(struct rhashtable *ht,
|
|
|
int i;
|
|
|
|
|
|
size = sizeof(*tbl) + nbuckets * sizeof(tbl->buckets[0]);
|
|
|
- if (size <= (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER) ||
|
|
|
- gfp != GFP_KERNEL)
|
|
|
+ if (gfp != GFP_KERNEL)
|
|
|
tbl = kzalloc(size, gfp | __GFP_NOWARN | __GFP_NORETRY);
|
|
|
- if (tbl == NULL && gfp == GFP_KERNEL)
|
|
|
- tbl = vzalloc(size);
|
|
|
+ else
|
|
|
+ tbl = kvzalloc(size, gfp);
|
|
|
|
|
|
size = nbuckets;
|
|
|
|