Commit 1c29b3ff authored Jul 29, 2009 by Mel Gorman Committed by Linus Torvalds Jul 29, 2009

net-dccp: suppress warning about large allocations from DCCP



The DCCP protocol tries to allocate some large hash tables during
initialisation using the largest size possible.  This can be larger than
what the page allocator can provide so it prints a warning.  However, the
caller is able to handle the situation so this patch suppresses the
warning.

Signed-off-by: Mel Gorman <mel@csn.ul.ie>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent b62f495d

net/dccp/proto.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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) {

Admin message