From 581f9627a150278e09f78c366efcf144b01f3b49 Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hughd@google.com>
Date: Thu, 13 Jan 2011 15:46:52 -0800
Subject: [PATCH] --- yaml --- r: 230772 b: refs/heads/master c:
 8a07651ee8cdaa9e27cb4ae372aed347533770f5 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a19da95aecca..4e2ebca36824 100644
--- 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
index c50a195041ec..840ce9d98f8b 100644
--- 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;