1 files changed, 12 insertions, 1 deletions

diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 20e3f8702d1e..f7a2a054a3c0 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -12,6 +12,7 @@
 #include <linux/mmiotrace.h>            /* kmmio_handler, ...           */
 #include <linux/perf_event.h>           /* perf_sw_event                */
 #include <linux/hugetlb.h>              /* hstate_index_to_shift        */
+#include <linux/prefetch.h>             /* prefetchw                    */
 
 #include <asm/traps.h>                  /* dotraplinkage, ...           */
 #include <asm/pgalloc.h>                /* pgd_*(), ...                 */
@@ -964,7 +965,7 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
         struct mm_struct *mm;
         int fault;
         int write = error_code & PF_WRITE;
-        unsigned int flags = FAULT_FLAG_ALLOW_RETRY |
+        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
                                         (write ? FAULT_FLAG_WRITE : 0);
 
         tsk = current;
@@ -1138,6 +1139,16 @@ good_area:
         }
 
         /*
+         * Pagefault was interrupted by SIGKILL. We have no reason to
+         * continue pagefault.
+         */
+        if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current)) {
+                if (!(error_code & PF_USER))
+                        no_context(regs, error_code, address);
+                return;
+        }
+
+        /*
          * Major/minor page fault accounting is only done on the
          * initial attempt. If we go through a retry, it is extremely
          * likely that the page will be found in page cache at that point.