diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2017-07-19 14:49:32 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-08-03 16:06:46 +1000 |
| commit | bb4be50e619b86eea31a28b09bf9fa3fcc5f4976 (patch) | |
| tree | 3448116a1759148e38f1316e5f5b096cf69e2b8a /arch/powerpc/mm/fault.c | |
| parent | f3d96e698ed0f83d8faa35071ea9ca0a57e74c50 (diff) | |
powerpc/mm: Move debugger check to notify_page_fault()
unclutters the main path
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/mm/fault.c')
| -rw-r--r-- | arch/powerpc/mm/fault.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c index 4470500b4871..2f825ae68f20 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c @@ -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); |