Skip to content

Commit

Permalink
parisc: 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.

Cc: linux-parisc@vger.kernel.org
Cc: linux-arch@vger.kernel.org
Signed-off-by: Nick Piggin <npiggin@suse.de>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
  • Loading branch information
Nick Piggin authored and Kyle McMartin committed May 30, 2010
1 parent 550f0d9 commit 53e30d0
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions arch/parisc/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,7 @@ void do_page_fault(struct pt_regs *regs, unsigned long code,

out_of_memory:
up_read(&mm->mmap_sem);
printk(KERN_CRIT "VM: killing process %s\n", current->comm);
if (user_mode(regs))
do_group_exit(SIGKILL);
goto no_context;
if (!user_mode(regs))
goto no_context;
pagefault_out_of_memory();
}

0 comments on commit 53e30d0

Please sign in to comment.