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 | |
| parent | 90415477bf1356f72acc34063ff52441fc10a754 (diff) | |
| download | op-kernel-dev-966567b7644b540962d90a0878706f59ae22c7e1.zip op-kernel-dev-966567b7644b540962d90a0878706f59ae22c7e1.tar.gz | |
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>
| -rw-r--r-- | net/netfilter/nf_conntrack_core.c | 3 | ||||
| -rw-r--r-- | net/tipc/ref.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index 32279dc..deeef74 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) 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) diff --git a/net/tipc/ref.c b/net/tipc/ref.c index 8311689..9e37b78 100644 --- a/net/tipc/ref.c +++ b/net/tipc/ref.c @@ -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; |
