From 090aafa634f5e82d741eb1ecb56c7233a641a1b3 Mon Sep 17 00:00:00 2001
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date: Tue, 10 Jan 2012 15:07:22 -0800
Subject: [PATCH] --- yaml --- r: 283001 b: refs/heads/master c:
 1e16a539ac16e7b3a8c2cee188897d4bdb88e6e8 h: refs/heads/master i:   282999:
 0e3c73d7aebb186ac6b15ff0cd0a7aa355f575cc v: v3

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

diff --git a/[refs] b/[refs]
index 88fcd8421eab..2e1621934699 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef009b25f4f8a77d2b32067d424d5ac757dcdc5b
+refs/heads/master: 1e16a539ac16e7b3a8c2cee188897d4bdb88e6e8
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
index 49e693b7fd0c..ab89d6f382d1 100644
--- a/trunk/mm/hugetlb.c
+++ b/trunk/mm/hugetlb.c
@@ -2640,6 +2640,8 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
 	static DEFINE_MUTEX(hugetlb_instantiation_mutex);
 	struct hstate *h = hstate_vma(vma);
 
+	address &= huge_page_mask(h);
+
 	ptep = huge_pte_offset(mm, address);
 	if (ptep) {
 		entry = huge_ptep_get(ptep);