Commit 3648bdf7 authored Jul 30, 2010 by Jesper Nilsson

CRIS: invoke oom-killer from page fault



As explained in commit 1c0fe6e3, 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>

parent 60dbd663

arch/cris/mm/fault.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -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);
		if (!user_mode(regs))
		goto no_context;
		pagefault_out_of_memory();
		return;

		do_sigbus:
		up_read(&mm->mmap_sem);