From 532ddf389793bc8657c71618fd5e4da9be528cf5 Mon Sep 17 00:00:00 2001
From: Dave Hansen <dave@linux.vnet.ibm.com>
Date: Wed, 30 May 2012 07:51:07 -0700
Subject: [PATCH] --- yaml --- r: 309177 b: refs/heads/master c:
 4523e1458566a0e8ecfaff90f380dd23acc44d27 h: refs/heads/master i:   309175:
 ae298472c0351011bb41e0586fd611b29d39602d v: v3

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

diff --git a/[refs] b/[refs]
index 796d8a023624..2d7dd73888ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 731a7378b81c2f5fa88ca1ae20b83d548d5613dc
+refs/heads/master: 4523e1458566a0e8ecfaff90f380dd23acc44d27
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
index 285a81e87ec8..e198831276a3 100644
--- a/trunk/mm/hugetlb.c
+++ b/trunk/mm/hugetlb.c
@@ -3036,7 +3036,8 @@ int hugetlb_reserve_pages(struct inode *inode,
 		region_add(&inode->i_mapping->private_list, from, to);
 	return 0;
 out_err:
-	resv_map_put(vma);
+	if (vma)
+		resv_map_put(vma);
 	return ret;
 }