From b8fbc169db90aa3ecec2325c7bd9825c8c8d884a Mon Sep 17 00:00:00 2001
From: Bo Liu <bo-liu@hotmail.com>
Date: Tue, 18 Aug 2009 14:11:19 -0700
Subject: [PATCH] --- yaml --- r: 156932 b: refs/heads/master c:
 7f9cfb31030737a7fc9a1cbca3fd01bec184c849 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/mm/page_alloc.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ecad24b393a9..a5fe66ae9fd6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 503f7944fac68f4fdf71f8ebd06907f51eb64515
+refs/heads/master: 7f9cfb31030737a7fc9a1cbca3fd01bec184c849
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index d052abbe3063..5cc986eb9f6f 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -2544,7 +2544,6 @@ static void build_zonelists(pg_data_t *pgdat)
 	prev_node = local_node;
 	nodes_clear(used_mask);
 
-	memset(node_load, 0, sizeof(node_load));
 	memset(node_order, 0, sizeof(node_order));
 	j = 0;
 
@@ -2653,6 +2652,9 @@ static int __build_all_zonelists(void *dummy)
 {
 	int nid;
 
+#ifdef CONFIG_NUMA
+	memset(node_load, 0, sizeof(node_load));
+#endif
 	for_each_online_node(nid) {
 		pg_data_t *pgdat = NODE_DATA(nid);