1 files changed, 3 insertions, 2 deletions

diff --git a/arch/sh/mm/fault.c b/arch/sh/mm/fault.c
index a58fec9b55e0..79d8276377d1 100644
--- a/arch/sh/mm/fault.c
+++ b/arch/sh/mm/fault.c
@@ -17,6 +17,7 @@
 #include <linux/kprobes.h>
 #include <linux/perf_event.h>
 #include <linux/kdebug.h>
+#include <linux/uaccess.h>
 #include <asm/io_trapped.h>
 #include <asm/mmu_context.h>
 #include <asm/tlbflush.h>
@@ -438,9 +439,9 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
 
         /*
          * If we're in an interrupt, have no user context or are running
-         * in an atomic region then we must not take the fault:
+         * with pagefaults disabled then we must not take the fault:
          */
-        if (unlikely(in_atomic() || !mm)) {
+        if (unlikely(faulthandler_disabled() || !mm)) {
                 bad_area_nosemaphore(regs, error_code, address);
                 return;
         }