1 files changed, 14 insertions, 5 deletions

diff --git a/mm/memory.c b/mm/memory.c
index 22e037e3364e..1fc358bec6d5 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2231,15 +2231,24 @@ static int wp_page_shared(struct mm_struct *mm, struct vm_area_struct *vma,
          * read-only shared pages can get COWed by
          * get_user_pages(.write=1, .force=1).
          */
-        if (vma->vm_ops && vma->vm_ops->page_mkwrite) {
+//      if (vma->vm_ops && vma->vm_ops->page_mkwrite) {
+        {
                 int tmp;
 
                 pte_unmap_unlock(page_table, ptl);
-                tmp = do_page_mkwrite(vma, old_page, address);
-                if (unlikely(!tmp || (tmp &
-                                      (VM_FAULT_ERROR | VM_FAULT_NOPAGE)))) {
+                
+                if (page_write_fault_retry(old_page)) {
                         page_cache_release(old_page);
-                        return tmp;
+                        return 0;
+                }
+                
+                if (vma->vm_ops && vma->vm_ops->page_mkwrite) {
+                        tmp = do_page_mkwrite(vma, old_page, address);
+                        if (unlikely(!tmp || (tmp &
+                                                  (VM_FAULT_ERROR | VM_FAULT_NOPAGE)))) {
+                                page_cache_release(old_page);
+                                return tmp;
+                        }
                 }
                 /*
                  * Since we dropped the lock we need to revalidate