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);