From 1482c480ee4e91ea6d0c044641866a817bd932ba Mon Sep 17 00:00:00 2001
From: Nick Piggin <npiggin@suse.de>
Date: Fri, 4 Jun 2010 14:14:49 -0700
Subject: [PATCH] --- yaml --- r: 199809 b: refs/heads/master c:
 f9c497c4aea28be826b8450a5339952f2ffc705e h: refs/heads/master i:   199807:
 9646fd7a5f590fc9f4ac1b7253520636bc9c62cf v: v3

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

diff --git a/[refs] b/[refs]
index 9e2e07d9a67e..9a04fced58c0 100644
--- 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
index 30f5d100a81c..a325d57a83d5 100644
--- 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);