1 files changed, 3 insertions, 3 deletions

diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c
index 83f12f2ed9e3..3066d40a6db1 100644
--- a/arch/cris/mm/fault.c
+++ b/arch/cris/mm/fault.c
@@ -8,7 +8,7 @@
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/wait.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <arch/system.h>
 
 extern int find_fixup_code(struct pt_regs *);
@@ -109,11 +109,11 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
         info.si_code = SEGV_MAPERR;
 
         /*
-         * If we're in an interrupt or "atomic" operation or have no
+         * If we're in an interrupt, have pagefaults disabled or have no
          * user context, we must not take the fault.
          */
 
-        if (in_atomic() || !mm)
+        if (faulthandler_disabled() || !mm)
                 goto no_context;
 
         if (user_mode(regs))