X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fcris%2Fmm%2Ffault.c;h=c73e91f1299a773ec8964f512f169429e16b6175;hb=97bf2856c6014879bd04983a3e9dfcdac1e7fe85;hp=934c51078ccee4bafca2b68b7752b1745a63ee03;hpb=76828883507a47dae78837ab5dec5a5b4513c667;p=linux-2.6.git

diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c
index 934c51078..c73e91f12 100644
--- 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);