diff options
| author | Jesper Nilsson <jesper.nilsson@axis.com> | 2010-07-30 18:34:16 +0200 |
|---|---|---|
| committer | Jesper Nilsson <jesper.nilsson@axis.com> | 2010-08-04 12:58:56 +0200 |
| commit | 3648bdf79f7e020c3a28c9c842111879d8e506c0 (patch) | |
| tree | 249c4ddafc35d0b08320eca51e3925edd90323d5 /arch/cris | |
| parent | 60dbd6633178a8625ed71329da0167c6d50c559c (diff) | |
| download | op-kernel-dev-3648bdf79f7e020c3a28c9c842111879d8e506c0.zip op-kernel-dev-3648bdf79f7e020c3a28c9c842111879d8e506c0.tar.gz | |
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/cris')
| -rw-r--r-- | arch/cris/mm/fault.c | 8 |
1 files changed, 4 insertions, 4 deletions
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); |
