---

yaml --- r: 26857 b: refs/heads/master c: bdd804f h: refs/heads/master i: 26855: ac3b123 v: v3
git-mirror · May 21, 2006 · 41bbd98 · 41bbd98
1 parent d7f3069
commit 41bbd98
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 593ee20766921fec643194dff829e17f30552220
+refs/heads/master: bdd804f478a0cc74bf7db8e9f9d5fd379d1b31ca
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -951,7 +951,7 @@ __alloc_pages(gfp_t gfp_mask, unsigned int order,
 		goto got_pg;
 
 	do {
-		if (cpuset_zone_allowed(*z, gfp_mask))
+		if (cpuset_zone_allowed(*z, gfp_mask|__GFP_HARDWALL))
 			wakeup_kswapd(*z, order);
 	} while (*(++z));
 
@@ -970,7 +970,8 @@ __alloc_pages(gfp_t gfp_mask, unsigned int order,
 		alloc_flags |= ALLOC_HARDER;
 	if (gfp_mask & __GFP_HIGH)
 		alloc_flags |= ALLOC_HIGH;
-	alloc_flags |= ALLOC_CPUSET;
+	if (wait)
+		alloc_flags |= ALLOC_CPUSET;
 
 	/*
 	 * Go through the zonelist again. Let __GFP_HIGH and allocations