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

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

powerpc/mm: Move debugger check to notify_page_fault() 



unclutters the main path

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

arch/powerpc/mm/fault.c

+8 −13
Original line number Diff line number Diff line
@@ -47,27 +47,25 @@ 


#include "icswx.h"



#ifdef CONFIG_KPROBES

static inline int notify_page_fault(struct pt_regs *regs)

static inline bool notify_page_fault(struct pt_regs *regs)

{

	int ret = 0;

	bool ret = false;



#ifdef CONFIG_KPROBES

	/* kprobe_running() needs smp_processor_id() */

	if (!user_mode(regs)) {

		preempt_disable();

		if (kprobe_running() && kprobe_fault_handler(regs, 11))

			ret = 1;

			ret = true;

		preempt_enable();

	}

#endif /* CONFIG_KPROBES */



	if (unlikely(debugger_fault_handler(regs)))

		ret = true;



	return ret;

}

#else

static inline int notify_page_fault(struct pt_regs *regs)

{

	return 0;

}

#endif



/*

 * Check whether the instruction at regs->nip is a store using
@@ -242,9 +240,6 @@ static int __do_page_fault(struct pt_regs *regs, unsigned long address, 
	if (notify_page_fault(regs))

		goto bail;



	if (unlikely(debugger_fault_handler(regs)))

		goto bail;



	if (unlikely(page_fault_is_bad(error_code))) {

		if (is_user)

			_exception(SIGBUS, regs, BUS_OBJERR, address);