From 1e9a999ad55f823836119d76107dbaaf9f97525a Mon Sep 17 00:00:00 2001
From: "Volodymyr G. Lukiianyk" <volodymyrgl@gmail.com>
Date: Thu, 13 Jan 2011 15:46:26 -0800
Subject: [PATCH] --- yaml --- r: 230740 b: refs/heads/master c:
 ecb256f815232b35ae8382cff36ca8ce0bbd077e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 128547b95450..dc5b9149b472 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc83edd941f412e938841b4989be24aa288a1aa6
+refs/heads/master: ecb256f815232b35ae8382cff36ca8ce0bbd077e
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index c31460918506..c18d1f7cff84 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -2631,9 +2631,16 @@ static int __parse_numa_zonelist_order(char *s)
 
 static __init int setup_numa_zonelist_order(char *s)
 {
-	if (s)
-		return __parse_numa_zonelist_order(s);
-	return 0;
+	int ret;
+
+	if (!s)
+		return 0;
+
+	ret = __parse_numa_zonelist_order(s);
+	if (ret == 0)
+		strlcpy(numa_zonelist_order, s, NUMA_ZONELIST_ORDER_LEN);
+
+	return ret;
 }
 early_param("numa_zonelist_order", setup_numa_zonelist_order);