From: Vineet Gupta <vgupta@synopsys.com>
Date: Tue, 14 May 2019 22:10:45 +0000 (-0700)
Subject: ARC: mm: do_page_fault refactor #6: error handlers to use same pattern
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=98cb57ad70fb7c8a9c030d3e83fe66b546906e28;p=linux.git

ARC: mm: do_page_fault refactor #6: error handlers to use same pattern

 - up_read
 - if !user_mode
 - whatever error handling

Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
---

diff --git a/arch/arc/mm/fault.c b/arch/arc/mm/fault.c
index b107e45cce947..2672ce24d741f 100644
--- a/arch/arc/mm/fault.c
+++ b/arch/arc/mm/fault.c
@@ -191,22 +191,21 @@ retry:
 bad_area:
 	up_read(&mm->mmap_sem);
 
-	/* User mode accesses just cause a SIGSEGV */
-	if (user_mode(regs)) {
-		tsk->thread.fault_address = address;
-		force_sig_fault(SIGSEGV, si_code, (void __user *)address, tsk);
-		return;
-	}
+	if (!user_mode(regs))
+		goto no_context;
+
+	tsk->thread.fault_address = address;
+	force_sig_fault(SIGSEGV, si_code, (void __user *)address, tsk);
+	return;
 
 out_of_memory:
 	up_read(&mm->mmap_sem);
 
-	if (user_mode(regs)) {
-		pagefault_out_of_memory();
-		return;
-	}
+	if (!user_mode(regs))
+		goto no_context;
 
-	goto no_context;
+	pagefault_out_of_memory();
+	return;
 
 do_sigbus:
 	up_read(&mm->mmap_sem);