Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758422AbZFVPn7 (ORCPT ); Mon, 22 Jun 2009 11:43:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757441AbZFVPnj (ORCPT ); Mon, 22 Jun 2009 11:43:39 -0400 Received: from gir.skynet.ie ([193.1.99.77]:35186 "EHLO gir.skynet.ie" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758207AbZFVPng (ORCPT ); Mon, 22 Jun 2009 11:43:36 -0400 From: Mel Gorman To: Andrew Morton Cc: Ingo Molnar , linux-kernel@vger.kernel.org, Linux Memory Management List , Heinz Diehl , Mel Gorman Subject: [PATCH 3/3] net-dccp: Suppress warning about large allocations from DCCP Date: Mon, 22 Jun 2009 16:43:34 +0100 Message-Id: <1245685414-8979-4-git-send-email-mel@csn.ul.ie> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1245685414-8979-1-git-send-email-mel@csn.ul.ie> References: <1245685414-8979-1-git-send-email-mel@csn.ul.ie> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1524 Lines: 40 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 --- net/dccp/proto.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/dccp/proto.c b/net/dccp/proto.c index 314a1b5..fd21676 100644 --- a/net/dccp/proto.c +++ b/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) { -- 1.5.6.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/