Commit 966567b7 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

net: two vzalloc() cleanups

We can use vzalloc() helper now instead of __vmalloc() trick
Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 90415477
...@@ -1342,8 +1342,7 @@ void *nf_ct_alloc_hashtable(unsigned int *sizep, int nulls) ...@@ -1342,8 +1342,7 @@ void *nf_ct_alloc_hashtable(unsigned int *sizep, int nulls)
get_order(sz)); get_order(sz));
if (!hash) { if (!hash) {
printk(KERN_WARNING "nf_conntrack: falling back to vmalloc.\n"); printk(KERN_WARNING "nf_conntrack: falling back to vmalloc.\n");
hash = __vmalloc(sz, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, hash = vzalloc(sz);
PAGE_KERNEL);
} }
if (hash && nulls) if (hash && nulls)
......
...@@ -110,8 +110,7 @@ int tipc_ref_table_init(u32 requested_size, u32 start) ...@@ -110,8 +110,7 @@ int tipc_ref_table_init(u32 requested_size, u32 start)
/* allocate table & mark all entries as uninitialized */ /* allocate table & mark all entries as uninitialized */
table = __vmalloc(actual_size * sizeof(struct reference), table = vzalloc(actual_size * sizeof(struct reference));
GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL);
if (table == NULL) if (table == NULL)
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment