From af6569e1b89175036a394d3fe0d09e16a8097e77 Mon Sep 17 00:00:00 2001
From: Hillf Danton <dhillf@gmail.com>
Date: Tue, 10 Jan 2012 15:08:30 -0800
Subject: [PATCH] --- yaml --- r: 283030 b: refs/heads/master c:
 ea5768c74b8e0d6a866508fc6399d5ff958da5e3 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 90c26dc581f6..2815a0e19621 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ebb7044c9142c67d1d2b04d84010b4810a43fd8
+refs/heads/master: ea5768c74b8e0d6a866508fc6399d5ff958da5e3
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
index bb7dc405634f..ea8c3a4cd2ae 100644
--- a/trunk/mm/hugetlb.c
+++ b/trunk/mm/hugetlb.c
@@ -800,7 +800,7 @@ static struct page *alloc_buddy_huge_page(struct hstate *h, int nid)
 
 	if (page && arch_prepare_hugepage(page)) {
 		__free_pages(page, huge_page_order(h));
-		return NULL;
+		page = NULL;
 	}
 
 	spin_lock(&hugetlb_lock);