Unverified Commit 7a75f3d4 authored by Pekka Enberg's avatar Pekka Enberg Committed by Palmer Dabbelt
Browse files

riscv/mm/fault: Simplify mm_fault_error() 



Simplify the mm_fault_error() handling function by eliminating the
unnecessary gotos.

Signed-off-by: default avatarPekka Enberg <penberg@kernel.org>
Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
parent 6c11ffbf

arch/riscv/mm/fault.c

+18 −23
Original line number Diff line number Diff line
@@ -39,25 +39,18 @@ static inline void no_context(struct pt_regs *regs, unsigned long addr) 


static inline void mm_fault_error(struct pt_regs *regs, unsigned long addr, vm_fault_t fault)

{

	if (fault & VM_FAULT_OOM)

		goto out_of_memory;

	else if (fault & VM_FAULT_SIGBUS)

		goto do_sigbus;

	BUG();



	if (fault & VM_FAULT_OOM) {

		/*

		 * We ran out of memory, call the OOM killer, and return the userspace

		 * (which will retry the fault, or kill us if we got oom-killed).

		 */

out_of_memory:

		if (!user_mode(regs)) {

			no_context(regs, addr);

			return;

		}

		pagefault_out_of_memory();

		return;



do_sigbus:

	} else if (fault & VM_FAULT_SIGBUS) {

		/* Kernel mode? Handle exceptions or die */

		if (!user_mode(regs)) {

			no_context(regs, addr);
@@ -66,6 +59,8 @@ static inline void mm_fault_error(struct pt_regs *regs, unsigned long addr, vm_f 
		do_trap(regs, SIGBUS, BUS_ADRERR, addr);

		return;

	}

	BUG();

}



static inline void bad_area(struct pt_regs *regs, struct mm_struct *mm, int code, unsigned long addr)

{