---

yaml --- r: 151539 b: refs/heads/master c: d395b73 h: refs/heads/master i: 151537: 5ee1dd8 151535: 972f129 v: v3
git-mirror · Jun 17, 2009 · fe0e11a · fe0e11a
1 parent ea63ce7
commit fe0e11a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da456f14d2f2d7350f2b9440af79c85a34c7eed5
+refs/heads/master: d395b73428d9748fb70b33477c9b2acae62f360a
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -1464,8 +1464,11 @@ get_page_from_freelist(gfp_t gfp_mask, nodemask_t *nodemask, unsigned int order,
 		if (NUMA_BUILD)
 			zlc_mark_zone_full(zonelist, z);
 try_next_zone:
-		if (NUMA_BUILD && !did_zlc_setup) {
-			/* we do zlc_setup after the first zone is tried */
+		if (NUMA_BUILD && !did_zlc_setup && num_online_nodes() > 1) {
+			/*
+			 * we do zlc_setup after the first zone is tried but only
+			 * if there are multiple nodes make it worthwhile
+			 */
 			allowednodes = zlc_setup(zonelist, alloc_flags);
 			zlc_active = 1;
 			did_zlc_setup = 1;