Commit 22e0a046 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky

[S390] use kprobes_built_in() in mm/fault code

Use kprobes_built_in() to avoid ifdefs like most other architectures do.
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 52499f40
...@@ -60,15 +60,13 @@ static inline int notify_page_fault(struct pt_regs *regs) ...@@ -60,15 +60,13 @@ static inline int notify_page_fault(struct pt_regs *regs)
{ {
int ret = 0; int ret = 0;
#ifdef CONFIG_KPROBES
/* kprobe_running() needs smp_processor_id() */ /* kprobe_running() needs smp_processor_id() */
if (!user_mode(regs)) { if (kprobes_built_in() && !user_mode(regs)) {
preempt_disable(); preempt_disable();
if (kprobe_running() && kprobe_fault_handler(regs, 14)) if (kprobe_running() && kprobe_fault_handler(regs, 14))
ret = 1; ret = 1;
preempt_enable(); preempt_enable();
} }
#endif
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment