From ebfe580f2754e60f6d3685675b41f0938ba73c4a Mon Sep 17 00:00:00 2001
From: Adam Litke <agl@us.ibm.com>
Date: Mon, 10 Dec 2007 15:49:28 -0800
Subject: [PATCH] --- yaml --- r: 74779 b: refs/heads/master c:
 72fad7139b6829f71d7f41f39eb30da5760d90a8 h: refs/heads/master i:   74777:
 d3aca5d00f8ef2c6082dc1a4401df5ce9e267b0c   74775:
 495053a26c5fe5fe6b265b1d48818225c4af6041 v: v3

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

diff --git a/[refs] b/[refs]
index 311b1430a1ce..cbade28b47ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8805f2387086a7e6a9647d0713fc075694130d6c
+refs/heads/master: 72fad7139b6829f71d7f41f39eb30da5760d90a8
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
index 6121b57bbe96..6f978218c2c8 100644
--- a/trunk/mm/hugetlb.c
+++ b/trunk/mm/hugetlb.c
@@ -907,7 +907,7 @@ int follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma,
 		 */
 		pte = huge_pte_offset(mm, vaddr & HPAGE_MASK);
 
-		if (!pte || pte_none(*pte)) {
+		if (!pte || pte_none(*pte) || (write && !pte_write(*pte))) {
 			int ret;
 
 			spin_unlock(&mm->page_table_lock);