From fbfa550ea4cb2bab7ff33f827ef67ec66a8cdfc2 Mon Sep 17 00:00:00 2001
From: Nick Piggin <npiggin@suse.de>
Date: Thu, 22 Apr 2010 16:06:23 +0000
Subject: [PATCH] --- yaml --- r: 199327 b: refs/heads/master c:
 53e30d022769434327a682d65031f129cd5d9c33 h: refs/heads/master i:   199325:
 c209f62bc6a1067a7fb42b915beb502bd97e1ec9   199323:
 8243434778c87d05c15a113dcf926aa80bb6b96f   199319:
 5ecfd7d066177ac43fb6df5b838e43071a6aec9a   199311:
 a3a08fabf67c60523af9605a0515bd7af4c91704   199295:
 6e32dc8b51cd2e41263ad28e70608694e8ec1997 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/parisc/mm/fault.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index f23e00fe1b7a..f683fda4fce6 100644
--- 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
index c6afbfc95770..18162ce4261e 100644
--- 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();
 }