From: Jesper Nilsson <jesper.nilsson@axis.com>
Date: Fri, 30 Jul 2010 16:34:16 +0000 (+0200)
Subject: CRIS: invoke oom-killer from page fault
X-Git-Tag: v2.6.36-rc1~484^2~48
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3648bdf79f7e020c3a28c9c842111879d8e506c0;p=profile%2Fivi%2Fkernel-x86-ivi.git

CRIS: invoke oom-killer from page fault

As explained in commit 1c0fe6e3bd, we want to call the architecture independent
oom killer when getting an unexplained OOM from handle_mm_fault, rather than
simply killing current.

Signed-off-by: Nick Piggin <npiggin@suse.de>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Mikael Starvik <starvik@axis.com>
---

diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c
index 380df1a..52b32b0 100644
--- a/arch/cris/mm/fault.c
+++ b/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);