From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon, 14 May 2007 09:19:11 +0000 (-0700)
Subject: [IPSEC]: Don't warn if high-order hash resize fails
X-Git-Tag: v2.6.22-rc2~110^2~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6253db055eb62a1bd0a18a1d8489565303b2b1dd;p=linux-2.6-omap-h63xx.git

[IPSEC]: Don't warn if high-order hash resize fails

Multi-page allocations are always likely to fail.  Since such failures
are expected and non-critical in xfrm_hash_alloc, we shouldn't warn about
them.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/xfrm/xfrm_hash.c b/net/xfrm/xfrm_hash.c
index 37643bb8768..55ab5792af5 100644
--- a/net/xfrm/xfrm_hash.c
+++ b/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);