---

yaml --- r: 250876 b: refs/heads/master c: c6a140b h: refs/heads/master v: v3
git-mirror · May 25, 2011 · efc7fc6 · efc7fc6
1 parent a40ad80
commit efc7fc6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6cccdc36c966e51fd969560d870cfd37afbfa9c
+refs/heads/master: c6a140bf164829769499b5e50d380893da39b29e
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -2107,7 +2107,7 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order,
 					sync_migration);
 	if (page)
 		goto got_pg;
-	sync_migration = !(gfp_mask & __GFP_NO_KSWAPD);
+	sync_migration = true;
 
 	/* Try direct reclaim and then allocating */
 	page = __alloc_pages_direct_reclaim(gfp_mask, order,