diff options
Diffstat (limited to 'arch/s390/mm/fault.c')
| -rw-r--r-- | arch/s390/mm/fault.c | 5 | 
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index fc102e70d9c..3040d7c78fe 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c @@ -30,6 +30,7 @@  #include <linux/kprobes.h>  #include <linux/uaccess.h>  #include <linux/hugetlb.h> +#include <asm/asm-offsets.h>  #include <asm/system.h>  #include <asm/pgtable.h>  #include <asm/s390_ext.h> @@ -59,15 +60,13 @@ static inline int notify_page_fault(struct pt_regs *regs)  {  	int ret = 0; -#ifdef CONFIG_KPROBES  	/* kprobe_running() needs smp_processor_id() */ -	if (!user_mode(regs)) { +	if (kprobes_built_in() && !user_mode(regs)) {  		preempt_disable();  		if (kprobe_running() && kprobe_fault_handler(regs, 14))  			ret = 1;  		preempt_enable();  	} -#endif  	return ret;  }  |