|
@@ -120,9 +120,8 @@ static struct bucket_table *bucket_table_alloc(struct rhashtable *ht,
|
|
if (size <= (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER) ||
|
|
if (size <= (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER) ||
|
|
gfp != GFP_KERNEL)
|
|
gfp != GFP_KERNEL)
|
|
tbl = kzalloc(size, gfp | __GFP_NOWARN | __GFP_NORETRY);
|
|
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)
|
|
if (tbl == NULL)
|
|
return NULL;
|
|
return NULL;
|
|
|
|
|