Skip to content

Commit

Permalink
CRIS: invoke oom-killer from page fault
Browse files Browse the repository at this point in the history
As explained in commit 1c0fe6e, 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>
  • Loading branch information
Jesper Nilsson committed Aug 4, 2010
1 parent 60dbd66 commit 3648bdf
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions arch/cris/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 3648bdf

Please sign in to comment.