Commit f9c497c4 authored Jun 04, 2010 by Nick Piggin Committed by Linus Torvalds Jun 04, 2010

frv: invoke oom-killer from page fault



As explained in commit 1c0fe6e3 ("mm: invoke oom-killer from page
fault") , 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 Howells <dhowells@redhat.com>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent b7e5d1f0

arch/frv/mm/fault.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -257,10 +257,10 @@ asmlinkage void do_page_fault(int datammu, unsigned long esr0, unsigned long ear
		*/
		out_of_memory:
		up_read(&mm->mmap_sem);
		printk("VM: killing process %s\n", current->comm);
		if (user_mode(__frame))
		do_group_exit(SIGKILL);
		if (!user_mode(__frame))
		goto no_context;
		pagefault_out_of_memory();
		return;

		do_sigbus:
		up_read(&mm->mmap_sem);