From 42de9f016ad6db63dbf9e5618bf23a0c70d21877 Mon Sep 17 00:00:00 2001 From: David Rientjes Date: Mon, 21 Sep 2009 17:01:15 -0700 Subject: [PATCH] --- yaml --- r: 164366 b: refs/heads/master c: 478b81fd84a299adb401dbbae296f3767e552999 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/page_alloc.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 64e8daf8bfd8..3d577e290828 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5abeeacc44bbef2935a7a8e939264c28962def2 +refs/heads/master: 478b81fd84a299adb401dbbae296f3767e552999 diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index a0de15f46987..f4e929e356db 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -1627,10 +1627,6 @@ __alloc_pages_direct_reclaim(gfp_t gfp_mask, unsigned int order, /* We now go into synchronous reclaim */ cpuset_memory_pressure_bump(); - - /* - * The task's cpuset might have expanded its set of allowable nodes - */ p->flags |= PF_MEMALLOC; lockdep_set_current_reclaim_state(gfp_mask); reclaim_state.reclaimed_slab = 0;