From de92287ccd41e8b02197556a85827b806459ce1a Mon Sep 17 00:00:00 2001
From: "Chen, Kenneth W" <kenneth.w.chen@intel.com>
Date: Fri, 31 Mar 2006 02:29:57 -0800
Subject: [PATCH] --- yaml --- r: 24850 b: refs/heads/master c:
 d6692183ac1d8f4a4e4015f9ce9acc2514618e0b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a1cbfd52cc3d..b44057cf7e9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93fac7041f082297b93655a0e49f659cd7520e40
+refs/heads/master: d6692183ac1d8f4a4e4015f9ce9acc2514618e0b
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
index ebad6bbb3501..d87885eb4acc 100644
--- a/trunk/mm/hugetlb.c
+++ b/trunk/mm/hugetlb.c
@@ -697,9 +697,10 @@ int follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma,
 		pfn_offset = (vaddr & ~HPAGE_MASK) >> PAGE_SHIFT;
 		page = pte_page(*pte);
 same_page:
-		get_page(page);
-		if (pages)
+		if (pages) {
+			get_page(page);
 			pages[i] = page + pfn_offset;
+		}
 
 		if (vmas)
 			vmas[i] = vma;