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

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

net/netfilter/nf_conntrack_core.c

+1 −2
Original line number Diff line number Diff line
@@ -1342,8 +1342,7 @@ void *nf_ct_alloc_hashtable(unsigned int *sizep, int nulls) 
					get_order(sz));

	if (!hash) {

		printk(KERN_WARNING "nf_conntrack: falling back to vmalloc.\n");

		hash = __vmalloc(sz, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO,

				 PAGE_KERNEL);

		hash = vzalloc(sz);

	}



	if (hash && nulls)

net/tipc/ref.c

+1 −2
Original line number Diff line number Diff line
@@ -110,8 +110,7 @@ int tipc_ref_table_init(u32 requested_size, u32 start) 


	/* allocate table & mark all entries as uninitialized */



	table = __vmalloc(actual_size * sizeof(struct reference),

			  GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL);

	table = vzalloc(actual_size * sizeof(struct reference));

	if (table == NULL)

		return -ENOMEM;