X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=arch%2Fcris%2Fmm%2Ffault.c;h=c73e91f1299a773ec8964f512f169429e16b6175;hb=6edaf68a87d17570790fd55f0c451a29ec1d6703;hp=fe1cc36b5aca0d31914c599938dac1994e7ea07b;hpb=da28c12089dfcfb8695b6b555cdb8e03dda2b690;p=powerpc.git

diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c
index fe1cc36b5a..c73e91f129 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);
@@ -284,13 +284,13 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
 	 */
 
 	switch (handle_mm_fault(mm, vma, address, writeaccess & 1)) {
-	case 1:
+	case VM_FAULT_MINOR:
 		tsk->min_flt++;
 		break;
-	case 2:
+	case VM_FAULT_MAJOR:
 		tsk->maj_flt++;
 		break;
-	case 0:
+	case VM_FAULT_SIGBUS:
 		goto do_sigbus;
 	default:
 		goto out_of_memory;