From b45dc3d04721c8685428c3361321fe27b3b6f2d7 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon, 14 May 2007 02:19:11 -0700
Subject: [PATCH] --- yaml --- r: 56374 b: refs/heads/master c:
 6253db055eb62a1bd0a18a1d8489565303b2b1dd h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/xfrm/xfrm_hash.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 58e44ea9e81a..bd5aed52d8f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5505c6e1071b32176c7548a3aaf0be49f7c763e
+refs/heads/master: 6253db055eb62a1bd0a18a1d8489565303b2b1dd
diff --git a/trunk/net/xfrm/xfrm_hash.c b/trunk/net/xfrm/xfrm_hash.c
index 37643bb8768a..55ab5792af56 100644
--- a/trunk/net/xfrm/xfrm_hash.c
+++ b/trunk/net/xfrm/xfrm_hash.c
@@ -22,7 +22,8 @@ struct hlist_head *xfrm_hash_alloc(unsigned int sz)
 		n = __vmalloc(sz, GFP_KERNEL, PAGE_KERNEL);
 	else
 		n = (struct hlist_head *)
-			__get_free_pages(GFP_KERNEL, get_order(sz));
+			__get_free_pages(GFP_KERNEL | __GFP_NOWARN,
+					 get_order(sz));
 
 	if (n)
 		memset(n, 0, sz);