---

yaml --- r: 199809 b: refs/heads/master c: f9c497c h: refs/heads/master i: 199807: 9646fd7 v: v3
git-mirror · Jun 4, 2010 · 1482c48 · 1482c48
1 parent e1c0240
commit 1482c48
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: b7e5d1f04104d98895945ecb463d750320dcd6cf
+refs/heads/master: f9c497c4aea28be826b8450a5339952f2ffc705e
diff --git a/trunk/arch/frv/mm/fault.c b/trunk/arch/frv/mm/fault.c
@@ -257,10 +257,10 @@ asmlinkage void do_page_fault(int datammu, unsigned long esr0, unsigned long ear
  */
  out_of_memory:
 	up_read(&mm->mmap_sem);
-	printk("VM: killing process %s\n", current->comm);
-	if (user_mode(__frame))
-		do_group_exit(SIGKILL);
-	goto no_context;
+	if (!user_mode(__frame))
+		goto no_context;
+	pagefault_out_of_memory();
+	return;
 
  do_sigbus:
 	up_read(&mm->mmap_sem);