1 files changed, 21 insertions, 20 deletions

diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 3aaeffcfd67a..7a517bb41060 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -51,7 +51,7 @@ kmmio_fault(struct pt_regs *regs, unsigned long addr)
         return 0;
 }
 
-static inline int __kprobes notify_page_fault(struct pt_regs *regs)
+static inline int __kprobes kprobes_fault(struct pt_regs *regs)
 {
         int ret = 0;
 
@@ -1048,7 +1048,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code)
                         return;
 
                 /* kprobes don't want to hook the spurious faults: */
-                if (notify_page_fault(regs))
+                if (kprobes_fault(regs))
                         return;
                 /*
                  * Don't take the mm semaphore here. If we fixup a prefetch
@@ -1060,23 +1060,8 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code)
         }
 
         /* kprobes don't want to hook the spurious faults: */
-        if (unlikely(notify_page_fault(regs)))
+        if (unlikely(kprobes_fault(regs)))
                 return;
-        /*
-         * It's safe to allow irq's after cr2 has been saved and the
-         * vmalloc fault has been handled.
-         *
-         * User-mode registers count as a user access even for any
-         * potential system fault or CPU buglet:
-         */
-        if (user_mode_vm(regs)) {
-                local_irq_enable();
-                error_code |= PF_USER;
-                flags |= FAULT_FLAG_USER;
-        } else {
-                if (regs->flags & X86_EFLAGS_IF)
-                        local_irq_enable();
-        }
 
         if (unlikely(error_code & PF_RSVD))
                 pgtable_bad(regs, error_code, address);
@@ -1088,8 +1073,6 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code)
                 }
         }
 
-        perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address);
-
         /*
          * If we're in an interrupt, have no user context or are running
          * in an atomic region then we must not take the fault:
@@ -1099,6 +1082,24 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code)
                 return;
         }
 
+        /*
+         * It's safe to allow irq's after cr2 has been saved and the
+         * vmalloc fault has been handled.
+         *
+         * User-mode registers count as a user access even for any
+         * potential system fault or CPU buglet:
+         */
+        if (user_mode_vm(regs)) {
+                local_irq_enable();
+                error_code |= PF_USER;
+                flags |= FAULT_FLAG_USER;
+        } else {
+                if (regs->flags & X86_EFLAGS_IF)
+                        local_irq_enable();
+        }
+
+        perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address);
+
         if (error_code & PF_WRITE)
                 flags |= FAULT_FLAG_WRITE;