From fb301b1bfcb38de7cf489780db8e47bd984c7c12 Mon Sep 17 00:00:00 2001
From: Chris Metcalf <cmetcalf@tilera.com>
Date: Mon, 1 Nov 2010 15:25:16 -0400
Subject: [PATCH] --- yaml --- r: 221574 b: refs/heads/master c:
 d59e609d6568ba5ab23c256f412ac5ec360722c1 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/arch/tile/mm/init.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f193be975c61..200c46315791 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d966115de84c22cd4df029cb00be0e51fab6c10
+refs/heads/master: d59e609d6568ba5ab23c256f412ac5ec360722c1
diff --git a/trunk/arch/tile/mm/init.c b/trunk/arch/tile/mm/init.c
index 78e1982cb6c9..0b9ce69b0ee5 100644
--- a/trunk/arch/tile/mm/init.c
+++ b/trunk/arch/tile/mm/init.c
@@ -988,8 +988,12 @@ static long __write_once initfree = 1;
 /* Select whether to free (1) or mark unusable (0) the __init pages. */
 static int __init set_initfree(char *str)
 {
-	strict_strtol(str, 0, &initfree);
-	pr_info("initfree: %s free init pages\n", initfree ? "will" : "won't");
+	long val;
+	if (strict_strtol(str, 0, &val)) {
+		initfree = val;
+		pr_info("initfree: %s free init pages\n",
+			initfree ? "will" : "won't");
+	}
 	return 1;
 }
 __setup("initfree=", set_initfree);