signal/arm64: Only call set_thread_esr once in do_page_fault

This code is truly common between the signal sending cases so share it.

Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Tested-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index ab85533e22555203387b0bc2b8edb39ff889cdac..959c4a565c8e751b400aa0d685f743cb993aff2c 100644 (file)
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -564,6 +564,7 @@ retry:
        }
 
        inf = esr_to_fault_info(esr);
+       set_thread_esr(addr, esr);
        if (fault & VM_FAULT_SIGBUS) {
                /*
                 * We had some memory, but were unable to successfully fix up
@@ -573,7 +574,6 @@ retry:
                si.si_signo     = SIGBUS;
                si.si_code      = BUS_ADRERR;
                si.si_addr = (void __user *)addr;
-               set_thread_esr(addr, esr);
                arm64_force_sig_info(&si, inf->name);
        } else if (fault & (VM_FAULT_HWPOISON_LARGE | VM_FAULT_HWPOISON)) {
                unsigned int lsb;
@@ -587,7 +587,6 @@ retry:
                si.si_code      = BUS_MCEERR_AR;
                si.si_addr = (void __user *)addr;
                si.si_addr_lsb  = lsb;
-               set_thread_esr(addr, esr);
                arm64_force_sig_info(&si, inf->name);
        } else {
                /*
@@ -599,7 +598,6 @@ retry:
                si.si_code      = fault == VM_FAULT_BADACCESS ?
                                  SEGV_ACCERR : SEGV_MAPERR;
                si.si_addr = (void __user *)addr;
-               set_thread_esr(addr, esr);
                arm64_force_sig_info(&si, inf->name);
        }