Unverified Commit 43632871 authored Aug 19, 2020 by Pekka Enberg Committed by Palmer Dabbelt Sep 15, 2020

riscv/mm: Simplify retry logic in do_page_fault()



Let's combine the two retry logic if statements in do_page_fault() to
simplify the code.

Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>

parent d012a719

arch/riscv/mm/fault.c

+9 −11

Original line number	Diff line number	Diff line
		@@ -127,8 +127,7 @@ good_area:
		BUG();
		}

		if (flags & FAULT_FLAG_ALLOW_RETRY) {
		if (fault & VM_FAULT_RETRY) {
		if (unlikely((fault & VM_FAULT_RETRY) && (flags & FAULT_FLAG_ALLOW_RETRY))) {
		flags \|= FAULT_FLAG_TRIED;

		/*
		@@ -138,7 +137,6 @@ good_area:
		*/
		goto retry;
		}
		}

		mmap_read_unlock(mm);
		return;

Admin message