From 54a26fd87dfc1a8ada834737f972f143f4c2b5e5 Mon Sep 17 00:00:00 2001 From: Mel Gorman Date: Wed, 29 Jul 2009 15:04:10 -0700 Subject: [PATCH] --- yaml --- r: 156049 b: refs/heads/master c: 1c29b3ff4f2d847464f7be3a0e179c6dfc69bd02 h: refs/heads/master i: 156047: 713f8c381a22f03525161edd004e632bcf3b101b v: v3 --- [refs] | 2 +- trunk/net/dccp/proto.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0dbd892b3cd4..e8705b12a4d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b62f495dad04fa94b5083aec638ff3072bccaaca +refs/heads/master: 1c29b3ff4f2d847464f7be3a0e179c6dfc69bd02 diff --git a/trunk/net/dccp/proto.c b/trunk/net/dccp/proto.c index 94ca8eaace7d..3281013ce038 100644 --- a/trunk/net/dccp/proto.c +++ b/trunk/net/dccp/proto.c @@ -1066,7 +1066,7 @@ static int __init dccp_init(void) (dccp_hashinfo.ehash_size - 1)) dccp_hashinfo.ehash_size--; dccp_hashinfo.ehash = (struct inet_ehash_bucket *) - __get_free_pages(GFP_ATOMIC, ehash_order); + __get_free_pages(GFP_ATOMIC|__GFP_NOWARN, ehash_order); } while (!dccp_hashinfo.ehash && --ehash_order > 0); if (!dccp_hashinfo.ehash) { @@ -1091,7 +1091,7 @@ static int __init dccp_init(void) bhash_order > 0) continue; dccp_hashinfo.bhash = (struct inet_bind_hashbucket *) - __get_free_pages(GFP_ATOMIC, bhash_order); + __get_free_pages(GFP_ATOMIC|__GFP_NOWARN, bhash_order); } while (!dccp_hashinfo.bhash && --bhash_order >= 0); if (!dccp_hashinfo.bhash) {