---

yaml --- r: 118903 b: refs/heads/master c: e33c3b5 h: refs/heads/master i: 118901: 95478e4 118899: c2ccd0b 118895: b6f8e0e v: v3
git-mirror · Nov 13, 2008 · 404bb1e · 404bb1e
1 parent 625d5af
commit 404bb1e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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;