patch-2.1.125 linux/arch/i386/mm/fault.c

• Lines: 33
• Date: Thu Oct 8 14:20:02 1998
• Orig file: v2.1.124/linux/arch/i386/mm/fault.c
• Orig date: Wed Sep 9 14:51:05 1998

diff -u --recursive --new-file v2.1.124/linux/arch/i386/mm/fault.c linux/arch/i386/mm/fault.c
@@ -103,8 +103,13 @@
 
 	tsk = current;
 	mm = tsk->mm;
-	if (in_interrupt())
-		die("page fault from irq handler",regs,error_code);
+
+	/*
+	 * If we're in an interrupt or have no user
+	 * context, we must not take the fault..
+	 */
+	if (in_interrupt() || mm == &init_mm)
+		goto no_context;
 
 	down(&mm->mmap_sem);
 
@@ -194,6 +199,7 @@
 		}
 	}
 
+no_context:
 	/* Are we prepared to handle this kernel fault?  */
 	if ((fixup = search_exception_table(regs->eip)) != 0) {
 		regs->eip = fixup;
@@ -235,8 +241,6 @@
 		page = ((unsigned long *) __va(page))[address >> PAGE_SHIFT];
 		printk(KERN_ALERT "*pte = %08lx\n", page);
 	}
-	lock_kernel();
 	die("Oops", regs, error_code);
 	do_exit(SIGKILL);
-	unlock_kernel();
 }