diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-12-19 16:01:38 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-12-19 16:01:38 -0500 |
commit | 966567b7644b540962d90a0878706f59ae22c7e1 (patch) | |
tree | 8e9507fe1266d63bd43fdc65f61423785556679d /net/netfilter | |
parent | 90415477bf1356f72acc34063ff52441fc10a754 (diff) |
net: two vzalloc() cleanups
We can use vzalloc() helper now instead of __vmalloc() trick
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter')
-rw-r--r-- | net/netfilter/nf_conntrack_core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index 32279dcd03c..deeef74e775 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c | |||
@@ -1342,8 +1342,7 @@ void *nf_ct_alloc_hashtable(unsigned int *sizep, int nulls) | |||
1342 | get_order(sz)); | 1342 | get_order(sz)); |
1343 | if (!hash) { | 1343 | if (!hash) { |
1344 | printk(KERN_WARNING "nf_conntrack: falling back to vmalloc.\n"); | 1344 | printk(KERN_WARNING "nf_conntrack: falling back to vmalloc.\n"); |
1345 | hash = __vmalloc(sz, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, | 1345 | hash = vzalloc(sz); |
1346 | PAGE_KERNEL); | ||
1347 | } | 1346 | } |
1348 | 1347 | ||
1349 | if (hash && nulls) | 1348 | if (hash && nulls) |