From fe0e11a5887e9537818264cd56b7ff752f14625e Mon Sep 17 00:00:00 2001 From: Mel Gorman Date: Tue, 16 Jun 2009 15:32:09 -0700 Subject: [PATCH] --- yaml --- r: 151539 b: refs/heads/master c: d395b73428d9748fb70b33477c9b2acae62f360a h: refs/heads/master i: 151537: 5ee1dd8e949e60a3d4a1e21bc52da567bae65da6 151535: 972f1290896c8d5e252558bb8b212a1140a2b5ac v: v3 --- [refs] | 2 +- trunk/mm/page_alloc.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 35077a1a71c2..cdccaa1baea5 100644 --- 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 index 03a386d24ef2..fd8e3ca0cf3b 100644 --- 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;