From 40c9a898b944b46883a5508bfdfa470c2db33f07 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Thu, 13 Jan 2011 15:47:22 -0800
Subject: [PATCH] --- yaml --- r: 230816 b: refs/heads/master c:
 32d6feadf4e17ea9b98071be9bbf402a74a4f818 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a78c0b8a46f0..e710baf56802 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29c1f677d424e8c5683a837fc4f03fc9f19201d7
+refs/heads/master: 32d6feadf4e17ea9b98071be9bbf402a74a4f818
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
index 7bf223d6677b..8e31cda6fc22 100644
--- a/trunk/mm/hugetlb.c
+++ b/trunk/mm/hugetlb.c
@@ -1374,8 +1374,10 @@ static ssize_t nr_hugepages_store_common(bool obey_mempolicy,
 	NODEMASK_ALLOC(nodemask_t, nodes_allowed, GFP_KERNEL | __GFP_NORETRY);
 
 	err = strict_strtoul(buf, 10, &count);
-	if (err)
+	if (err) {
+		NODEMASK_FREE(nodes_allowed);
 		return 0;
+	}
 
 	h = kobj_to_hstate(kobj, &nid);
 	if (nid == NUMA_NO_NODE) {