Merge ../linus

[linux-drm-fsl-dcu.git] / arch / cris / mm / fault.c

diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c
index 934c51078ccee4bafca2b68b7752b1745a63ee03..c73e91f1299a773ec8964f512f169429e16b6175 100644 (file)
--- a/arch/cris/mm/fault.c
+++ b/arch/cris/mm/fault.c
@@ -232,7 +232,7 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
         * context, we must not take the fault..
         */
 
-       if (in_interrupt() || !mm)
+       if (in_atomic() || !mm)
                goto no_context;
 
        down_read(&mm->mmap_sem);