summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJesper Nilsson <jesper.nilsson@axis.com>2010-07-30 18:34:16 +0200
committerJesper Nilsson <jesper.nilsson@axis.com>2010-08-04 12:58:56 +0200
commit3648bdf79f7e020c3a28c9c842111879d8e506c0 (patch)
tree249c4ddafc35d0b08320eca51e3925edd90323d5 /arch
parentCRIS: GENERIC_TIME fixes (diff)
downloadlinux-3648bdf79f7e020c3a28c9c842111879d8e506c0.tar.xz
linux-3648bdf79f7e020c3a28c9c842111879d8e506c0.zip
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/cris/mm/fault.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c
index 380df1a73a6e..52b32b092603 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);