From 4cffba1f0da7df601922336f7f8057f4acae9852 Mon Sep 17 00:00:00 2001
From: Jesper Nilsson <jesper.nilsson@axis.com>
Date: Fri, 30 Jul 2010 18:34:16 +0200
Subject: [PATCH] --- yaml --- r: 207112 b: refs/heads/master c:
 3648bdf79f7e020c3a28c9c842111879d8e506c0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e71ae04d88fc..463e6fc42f58 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60dbd6633178a8625ed71329da0167c6d50c559c
+refs/heads/master: 3648bdf79f7e020c3a28c9c842111879d8e506c0
diff --git a/trunk/arch/cris/mm/fault.c b/trunk/arch/cris/mm/fault.c
index 380df1a73a6e..52b32b092603 100644
--- a/trunk/arch/cris/mm/fault.c
+++ b/trunk/arch/cris/mm/fault.c
@@ -245,10 +245,10 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
 
  out_of_memory:
 	up_read(&mm->mmap_sem);
-	printk("VM: killing process %s\n", tsk->comm);
-	if (user_mode(regs))
-		do_exit(SIGKILL);
-	goto no_context;
+	if (!user_mode(regs))
+		goto no_context;
+	pagefault_out_of_memory();
+	return;
 
  do_sigbus:
 	up_read(&mm->mmap_sem);