arc/mm: use helper fault_signal_pending()

[linux-2.6-microblaze.git] / arch / arc / mm / fault.c

diff --git a/arch/arc/mm/fault.c b/arch/arc/mm/fault.c
index fb86bc3..6eb821a 100644 (file)
--- a/arch/arc/mm/fault.c
+++ b/arch/arc/mm/fault.c
@@ -133,29 +133,21 @@ retry:
 
        fault = handle_mm_fault(vma, address, flags);
 
+       /* Quick path to respond to signals */
+       if (fault_signal_pending(fault, regs)) {
+               if (!user_mode(regs))
+                       goto no_context;
+               return;
+       }
+
        /*
-        * Fault retry nuances
+        * Fault retry nuances, mmap_sem already relinquished by core mm
         */
-       if (unlikely(fault & VM_FAULT_RETRY)) {
-
-               /*
-                * If fault needs to be retried, handle any pending signals
-                * first (by returning to user mode).
-                * mmap_sem already relinquished by core mm for RETRY case
-                */
-               if (fatal_signal_pending(current)) {
-                       if (!user_mode(regs))
-                               goto no_context;
-                       return;
-               }
-               /*
-                * retry state machine
-                */
-               if (flags & FAULT_FLAG_ALLOW_RETRY) {
-                       flags &= ~FAULT_FLAG_ALLOW_RETRY;
-                       flags |= FAULT_FLAG_TRIED;
-                       goto retry;
-               }
+       if (unlikely((fault & VM_FAULT_RETRY) &&
+                    (flags & FAULT_FLAG_ALLOW_RETRY))) {
+               flags &= ~FAULT_FLAG_ALLOW_RETRY;
+               flags |= FAULT_FLAG_TRIED;
+               goto retry;
        }
 
 bad_area: