|
@@ -1003,14 +1003,10 @@ struct xt_table_info *xt_alloc_table_info(unsigned int size)
|
|
if ((SMP_ALIGN(size) >> PAGE_SHIFT) + 2 > totalram_pages)
|
|
if ((SMP_ALIGN(size) >> PAGE_SHIFT) + 2 > totalram_pages)
|
|
return NULL;
|
|
return NULL;
|
|
|
|
|
|
- if (sz <= (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER))
|
|
|
|
- info = kmalloc(sz, GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY);
|
|
|
|
- if (!info) {
|
|
|
|
- info = __vmalloc(sz, GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY,
|
|
|
|
- PAGE_KERNEL);
|
|
|
|
- if (!info)
|
|
|
|
- return NULL;
|
|
|
|
- }
|
|
|
|
|
|
+ info = kvmalloc(sz, GFP_KERNEL);
|
|
|
|
+ if (!info)
|
|
|
|
+ return NULL;
|
|
|
|
+
|
|
memset(info, 0, sizeof(*info));
|
|
memset(info, 0, sizeof(*info));
|
|
info->size = size;
|
|
info->size = size;
|
|
return info;
|
|
return info;
|