---

yaml --- r: 199327 b: refs/heads/master c: 53e30d0 h: refs/heads/master i: 199325: c209f62 199323: 8243434 199319: 5ecfd7d 199311: a3a08fa 199295: 6e32dc8 v: v3
git-mirror · May 30, 2010 · fbfa550 · fbfa550
1 parent 36421df
commit fbfa550
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 550f0d922286556c7ea43974bb7921effb5a5278
+refs/heads/master: 53e30d022769434327a682d65031f129cd5d9c33
diff --git a/trunk/arch/parisc/mm/fault.c b/trunk/arch/parisc/mm/fault.c
@@ -264,8 +264,7 @@ void do_page_fault(struct pt_regs *regs, unsigned long code,
 
   out_of_memory:
 	up_read(&mm->mmap_sem);
-	printk(KERN_CRIT "VM: killing process %s\n", current->comm);
-	if (user_mode(regs))
-		do_group_exit(SIGKILL);
-	goto no_context;
+	if (!user_mode(regs))
+		goto no_context;
+	pagefault_out_of_memory();
 }