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

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

diff --git a/[refs] b/[refs]
index 8dc612c69578..4f1144144596 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68db30ce609a8fc21b95f38f509c65dab0ecfa96
+refs/heads/master: c421b08ef52f38049c6f591c5d260a97af7b0000
diff --git a/trunk/arch/mn10300/mm/fault.c b/trunk/arch/mn10300/mm/fault.c
index 53bb17d0f068..81f153fa51b4 100644
--- a/trunk/arch/mn10300/mm/fault.c
+++ b/trunk/arch/mn10300/mm/fault.c
@@ -338,11 +338,10 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long fault_code,
  */
 out_of_memory:
 	up_read(&mm->mmap_sem);
-	monitor_signal(regs);
-	printk(KERN_ALERT "VM: killing process %s\n", tsk->comm);
-	if ((fault_code & MMUFCR_xFC_ACCESS) == MMUFCR_xFC_ACCESS_USR)
-		do_exit(SIGKILL);
-	goto no_context;
+	if ((fault_code & MMUFCR_xFC_ACCESS) != MMUFCR_xFC_ACCESS_USR)
+		goto no_context;
+	pagefault_out_of_memory();
+	return;
 
 do_sigbus:
 	up_read(&mm->mmap_sem);