1 files changed, 1 insertions, 3 deletions

diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index 8af5b3cbed50..3040d7c78fe0 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -60,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;
 }