---

yaml --- r: 207112 b: refs/heads/master c: 3648bdf h: refs/heads/master v: v3
git-mirror · Aug 4, 2010 · 4cffba1 · 4cffba1
1 parent 215dab5
commit 4cffba1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60dbd6633178a8625ed71329da0167c6d50c559c
+refs/heads/master: 3648bdf79f7e020c3a28c9c842111879d8e506c0
diff --git a/trunk/arch/cris/mm/fault.c b/trunk/arch/cris/mm/fault.c
@@ -245,10 +245,10 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
 
  out_of_memory:
 	up_read(&mm->mmap_sem);
-	printk("VM: killing process %s\n", tsk->comm);
-	if (user_mode(regs))
-		do_exit(SIGKILL);
-	goto no_context;
+	if (!user_mode(regs))
+		goto no_context;
+	pagefault_out_of_memory();
+	return;
 
  do_sigbus:
 	up_read(&mm->mmap_sem);