[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <alpine.DEB.2.00.1101111341590.7551@chino.kir.corp.google.com>
Date: Tue, 11 Jan 2011 13:43:06 -0800 (PST)
From: David Rientjes <rientjes@...gle.com>
To: linux-kernel@...r.kernel.org
cc: mm-commits@...r.kernel.org, akpm@...ux-foundation.org,
hughd@...gle.com, mel@....ul.ie
Subject: Re: + mm-vmscan-reclaim-order-0-and-use-compaction-instead-of-lumpy-reclaim-avoid-a-potential-deadlock-due-to-lock_page-during-direct-compaction-fix.patch
added to -mm tree
On Tue, 11 Jan 2011, akpm@...ux-foundation.org wrote:
> diff -puN mm/page_alloc.c~mm-vmscan-reclaim-order-0-and-use-compaction-instead-of-lumpy-reclaim-avoid-a-potential-deadlock-due-to-lock_page-during-direct-compaction-fix mm/page_alloc.c
> --- a/mm/page_alloc.c~mm-vmscan-reclaim-order-0-and-use-compaction-instead-of-lumpy-reclaim-avoid-a-potential-deadlock-due-to-lock_page-during-direct-compaction-fix
> +++ a/mm/page_alloc.c
> @@ -1815,15 +1815,15 @@ __alloc_pages_direct_compact(gfp_t gfp_m
> int migratetype, unsigned long *did_some_progress)
> {
> struct page *page;
> - struct task_struct *p = current;
> + struct task_struct *tsk = current;
>
> if (!order || compaction_deferred(preferred_zone))
> return NULL;
>
> - p->flags |= PF_MEMALLOC;
> + tsk->flags |= PF_MEMALLOC;
> *did_some_progress = try_to_compact_pages(zonelist, order, gfp_mask,
> nodemask);
> - p->flags &= ~PF_MEMALLOC;
> + tsk->flags &= ~PF_MEMALLOC;
> if (*did_some_progress != COMPACT_SKIPPED) {
>
> /* Page migration frees to the PCP lists but we want merging */
This could be done for all of the page allocator functions in
mm/page_alloc.c, I think it would be inconsistent and slightly harder to
read if it were done in only one.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists