diff options
| author |   Pekka Enberg <penberg@kernel.org> | 2020-08-25 19:05:44 +0300 |
|---|---|---|
| committer |   Palmer Dabbelt <palmerdabbelt@google.com> | 2020-09-15 18:46:03 -0700 |
| commit | 7a75f3d47a0b1be6eeb67d14e4003b2b91f8aa59 (patch) | |
| tree | af830ad4011766cc5bd7173e82f345c70add35f3 /arch/riscv/mm/fault.c | |
| parent | riscv/mm/fault: Move fault error handling to mm_fault_error() (diff) | |
| download | linux-dev-7a75f3d47a0b1be6eeb67d14e4003b2b91f8aa59.tar.xz linux-dev-7a75f3d47a0b1be6eeb67d14e4003b2b91f8aa59.zip | |
riscv/mm/fault: Simplify mm_fault_error()
Simplify the mm_fault_error() handling function by eliminating the
unnecessary gotos.
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
Diffstat (limited to 'arch/riscv/mm/fault.c')
| -rw-r--r-- | arch/riscv/mm/fault.c | 41 |
1 files changed, 18 insertions, 23 deletions
diff --git a/arch/riscv/mm/fault.c b/arch/riscv/mm/fault.c index 49b190d0c088..3b430fb18de3 100644 --- a/arch/riscv/mm/fault.c +++ b/arch/riscv/mm/fault.c @@ -39,32 +39,27 @@ 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(); - - /* - * 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); + 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). + */ + if (!user_mode(regs)) { + no_context(regs, addr); + return; + } + pagefault_out_of_memory(); return; - } - pagefault_out_of_memory(); - return; - -do_sigbus: - /* Kernel mode? Handle exceptions or die */ - if (!user_mode(regs)) { - no_context(regs, addr); + } else if (fault & VM_FAULT_SIGBUS) { + /* Kernel mode? Handle exceptions or die */ + if (!user_mode(regs)) { + no_context(regs, addr); + return; + } + do_trap(regs, SIGBUS, BUS_ADRERR, addr); return; } - 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) |