---

yaml --- r: 230772 b: refs/heads/master c: 8a07651 h: refs/heads/master v: v3
git-mirror · Jan 14, 2011 · 581f962 · 581f962
1 parent bb35a58
commit 581f962
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71e3aac0724ffe8918992d76acfe3aad7d8724a5
+refs/heads/master: 8a07651ee8cdaa9e27cb4ae372aed347533770f5
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
@@ -1288,7 +1288,7 @@ struct page *follow_page(struct vm_area_struct *vma, unsigned long address,
 	pud = pud_offset(pgd, address);
 	if (pud_none(*pud))
 		goto no_page_table;
-	if (pud_huge(*pud)) {
+	if (pud_huge(*pud) && vma->vm_flags & VM_HUGETLB) {
 		BUG_ON(flags & FOLL_GET);
 		page = follow_huge_pud(mm, address, pud, flags & FOLL_WRITE);
 		goto out;