[PATCH v5 07/16] powerpc/mm: Use helper fault_signal_pending()

[Peter Xu]

Let powerpc code to use the new helper, by moving the signal handling
earlier before the retry logic.

Signed-off-by: Peter Xu <pet...@redhat.com>
---
 arch/powerpc/mm/fault.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index 8432c281de92..7dabd1243f1b 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -583,6 +583,9 @@ static int __do_page_fault(struct pt_regs *regs, unsigned 
long address,
 
        major |= fault & VM_FAULT_MAJOR;
 
+       if (fault_signal_pending(fault, regs))
+               return user_mode(regs) ? 0 : SIGBUS;
+
        /*
         * Handle the retry right now, the mmap_sem has been released in that
         * case.
@@ -596,15 +599,8 @@ static int __do_page_fault(struct pt_regs *regs, unsigned 
long address,
                         */
                        flags &= ~FAULT_FLAG_ALLOW_RETRY;
                        flags |= FAULT_FLAG_TRIED;
-                       if (!fatal_signal_pending(current))
-                               goto retry;
+                       goto retry;
                }
-
-               /*
-                * User mode? Just return to handle the fatal exception 
otherwise
-                * return to bad_page_fault
-                */
-               return is_user ? 0 : SIGBUS;
        }
 
        up_read(&current->mm->mmap_sem);
-- 
2.21.0