---

yaml --- r: 283001 b: refs/heads/master c: 1e16a53 h: refs/heads/master i: 282999: 0e3c73d v: v3
git-mirror · Jan 11, 2012 · 090aafa · 090aafa
1 parent b5434d9
commit 090aafa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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);