From 404bb1ec2c9f1a231b1cb8fdcbdfb95096080a01 Mon Sep 17 00:00:00 2001
From: David Rientjes <rientjes@google.com>
Date: Wed, 12 Nov 2008 13:25:37 -0800
Subject: [PATCH] --- yaml --- r: 118903 b: refs/heads/master c:
 e33c3b5e172e2e45456f42fba47227d48745543f h: refs/heads/master i:   118901:
 95478e47bdb8cf26414a1ec60fcaacfb4079054f   118899:
 c2ccd0ba23a243e6606aaa4cab7ca65ec5688a56   118895:
 b6f8e0ecf3aa769c7ce8a5dd69bdf3fead3e89a5 v: v3

---
 [refs]                | 2 +-
 trunk/mm/page_alloc.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index abc4b0634647..f6cb0fc3eba0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0f7e0dc7393268947dc3ed285defc3d375487b9
+refs/heads/master: e33c3b5e172e2e45456f42fba47227d48745543f
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index 54069e64e3a8..d8ac01474563 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -1561,6 +1561,10 @@ __alloc_pages_internal(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
+	 */
+	cpuset_update_task_memory_state();
 	p->flags |= PF_MEMALLOC;
 	reclaim_state.reclaimed_slab = 0;
 	p->reclaim_state = &reclaim_state;