[PATCH v5 08/16] sh/mm: Use helper fault_signal_pending()

[Peter Xu]

Let SH to use the new fault_signal_pending() helper.  Here we'll need
to move the up_read() out because that's actually needed as long as
!RETRY cases.  At the meantime we can drop all the rest of up_read()s
now (which seems to be cleaner).

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

diff --git a/arch/sh/mm/fault.c b/arch/sh/mm/fault.c
index 5f51456f4fc7..eb4048ad0b38 100644
--- a/arch/sh/mm/fault.c
+++ b/arch/sh/mm/fault.c
@@ -302,25 +302,25 @@ mm_fault_error(struct pt_regs *regs, unsigned long 
error_code,
         * Pagefault was interrupted by SIGKILL. We have no reason to
         * continue pagefault.
         */
-       if (fatal_signal_pending(current)) {
-               if (!(fault & VM_FAULT_RETRY))
-                       up_read(&current->mm->mmap_sem);
+       if (fault_signal_pending(fault, regs)) {
                if (!user_mode(regs))
                        no_context(regs, error_code, address);
                return 1;
        }
 
+       /* Release mmap_sem first if necessary */
+       if (!(fault & VM_FAULT_RETRY))
+               up_read(&current->mm->mmap_sem);
+
        if (!(fault & VM_FAULT_ERROR))
                return 0;
 
        if (fault & VM_FAULT_OOM) {
                /* Kernel mode? Handle exceptions or die: */
                if (!user_mode(regs)) {
-                       up_read(&current->mm->mmap_sem);
                        no_context(regs, error_code, address);
                        return 1;
                }
-               up_read(&current->mm->mmap_sem);
 
                /*
                 * We ran out of memory, call the OOM killer, and return the
-- 
2.21.0