1 files changed, 4 insertions, 1 deletions

diff --git a/mm/memory.c b/mm/memory.c
index e48945ab362b..615be5127ce1 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1569,6 +1569,8 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
                                         fault_flags |= FAULT_FLAG_WRITE;
                                 if (nonblocking)
                                         fault_flags |= FAULT_FLAG_ALLOW_RETRY;
+                                if (foll_flags & FOLL_NOWAIT)
+                                        fault_flags |= (FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_RETRY_NOWAIT);
 
                                 ret = handle_mm_fault(mm, vma, start,
                                                         fault_flags);
@@ -1595,7 +1597,8 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
                                         tsk->min_flt++;
 
                                 if (ret & VM_FAULT_RETRY) {
-                                        *nonblocking = 0;
+                                        if (nonblocking)
+                                                *nonblocking = 0;
                                         return i;
                                 }