Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755110AbZKMN4U (ORCPT ); Fri, 13 Nov 2009 08:56:20 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754466AbZKMN4P (ORCPT ); Fri, 13 Nov 2009 08:56:15 -0500 Received: from gir.skynet.ie ([193.1.99.77]:53953 "EHLO gir.skynet.ie" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753288AbZKMN4O (ORCPT ); Fri, 13 Nov 2009 08:56:14 -0500 Date: Fri, 13 Nov 2009 13:56:16 +0000 From: Mel Gorman To: KOSAKI Motohiro Cc: Andrew Morton , Frans Pop , Jiri Kosina , Sven Geggus , Karol Lewandowski , Tobias Oetiker , linux-kernel@vger.kernel.org, "linux-mm@kvack.org" , Pekka Enberg , Rik van Riel , Christoph Lameter , Stephan von Krawczynski , "Rafael J. Wysocki" , Kernel Testers List Subject: Re: [PATCH 2/5] page allocator: Do not allow interrupts to use ALLOC_HARDER Message-ID: <20091113135616.GH29804@csn.ul.ie> References: <1258054235-3208-1-git-send-email-mel@csn.ul.ie> <1258054235-3208-3-git-send-email-mel@csn.ul.ie> <20091113142328.33B0.A69D9226@jp.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <20091113142328.33B0.A69D9226@jp.fujitsu.com> User-Agent: Mutt/1.5.17+20080114 (2008-01-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1748 Lines: 53 On Fri, Nov 13, 2009 at 02:24:13PM +0900, KOSAKI Motohiro wrote: > > Commit 341ce06f69abfafa31b9468410a13dbd60e2b237 altered watermark logic > > slightly by allowing rt_tasks that are handling an interrupt to set > > ALLOC_HARDER. This patch brings the watermark logic more in line with > > 2.6.30. > > ditto. > afaik, this patch have been sent to linus. > And ditto, it's there for testers, particularly when patching against 2.6.31. > > > > > [rientjes@google.com: Spotted the problem] > > Signed-off-by: Mel Gorman > > Reviewed-by: Pekka Enberg > > Reviewed-by: Rik van Riel > > Reviewed-by: KOSAKI Motohiro > > --- > > mm/page_alloc.c | 2 +- > > 1 files changed, 1 insertions(+), 1 deletions(-) > > > > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > > index 250d055..2bc2ac6 100644 > > --- a/mm/page_alloc.c > > +++ b/mm/page_alloc.c > > @@ -1769,7 +1769,7 @@ gfp_to_alloc_flags(gfp_t gfp_mask) > > * See also cpuset_zone_allowed() comment in kernel/cpuset.c. > > */ > > alloc_flags &= ~ALLOC_CPUSET; > > - } else if (unlikely(rt_task(p))) > > + } else if (unlikely(rt_task(p)) && !in_interrupt()) > > alloc_flags |= ALLOC_HARDER; > > > > if (likely(!(gfp_mask & __GFP_NOMEMALLOC))) { > > -- > > 1.6.5 > > > > > -- Mel Gorman Part-time Phd Student Linux Technology Center University of Limerick IBM Dublin Software Lab -- 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/