Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7afad422 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Michael Ellerman
Browse files

powerpc/mm: Move exception_enter/exit to a do_page_fault wrapper 



This will allow simplifying the returns from do_page_fault

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 424de9c6

arch/powerpc/mm/fault.c

+11 −3
Original line number Diff line number Diff line
@@ -195,10 +195,9 @@ static int mm_fault_error(struct pt_regs *regs, unsigned long addr, int fault) 
 * The return value is 0 if the fault was handled, or the signal

 * number if this is a kernel fault that can't be handled here.

 */

int do_page_fault(struct pt_regs *regs, unsigned long address,

static int __do_page_fault(struct pt_regs *regs, unsigned long address,

			   unsigned long error_code)

{

	enum ctx_state prev_state = exception_enter();

	struct vm_area_struct * vma;

	struct mm_struct *mm = current->mm;

	unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
@@ -523,6 +522,15 @@ int do_page_fault(struct pt_regs *regs, unsigned long address, 
	rc = SIGSEGV;



bail:

	return rc;

}

NOKPROBE_SYMBOL(__do_page_fault);



int do_page_fault(struct pt_regs *regs, unsigned long address,

		  unsigned long error_code)

{

	enum ctx_state prev_state = exception_enter();

	int rc = __do_page_fault(regs, address, error_code);

	exception_exit(prev_state);

	return rc;

}