From c0473dd57c4023ade354ad73e600786eef199229 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Mon, 19 Dec 2011 16:01:38 -0500
Subject: [PATCH] --- yaml --- r: 279017 b: refs/heads/master c:
 966567b7644b540962d90a0878706f59ae22c7e1 h: refs/heads/master i:   279015:
 e8ebd89459cde6dd177cf530a369aa3f573708da v: v3

---
 [refs]                                  | 2 +-
 trunk/net/netfilter/nf_conntrack_core.c | 3 +--
 trunk/net/tipc/ref.c                    | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 2efc85b16377..0b8677fd0807 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90415477bf1356f72acc34063ff52441fc10a754
+refs/heads/master: 966567b7644b540962d90a0878706f59ae22c7e1
diff --git a/trunk/net/netfilter/nf_conntrack_core.c b/trunk/net/netfilter/nf_conntrack_core.c
index 32279dcd03cf..deeef74e775f 100644
--- a/trunk/net/netfilter/nf_conntrack_core.c
+++ b/trunk/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/trunk/net/tipc/ref.c b/trunk/net/tipc/ref.c
index 83116892528b..9e37b7812c3c 100644
--- a/trunk/net/tipc/ref.c
+++ b/trunk/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;