aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2007-05-14 02:19:11 -0700
committerDavid S. Miller <davem@davemloft.net>2007-05-14 02:19:11 -0700
commit6253db055eb62a1bd0a18a1d8489565303b2b1dd (patch)
tree06440f71cda30cd10523424dc9855ac6076d9f1c /net
parent[IPSEC]: Check validity of direction in xfrm_policy_byid (diff)
downloadlinux-dev-6253db055eb62a1bd0a18a1d8489565303b2b1dd.tar.xz
linux-dev-6253db055eb62a1bd0a18a1d8489565303b2b1dd.zip
[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>
Diffstat (limited to 'net')
-rw-r--r--net/xfrm/xfrm_hash.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_hash.c b/net/xfrm/xfrm_hash.c
index 37643bb8768a..55ab5792af56 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);