Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67a8a20f authored by Nick Piggin's avatar Nick Piggin Committed by Linus Torvalds
Browse files

avr32: 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: default avatarNick Piggin <npiggin@suse.de>
Acked-by: default avatarHaavard Skinnemoen <hskinnemoen@atmel.com>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 596d7cfa

arch/avr32/mm/fault.c

+4 −10
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ asmlinkage void do_page_fault(unsigned long ecr, struct pt_regs *regs) 
	 * sure we exit gracefully rather than endlessly redo the

	 * fault.

	 */

survive:

	fault = handle_mm_fault(mm, vma, address, writeaccess ? FAULT_FLAG_WRITE : 0);

	if (unlikely(fault & VM_FAULT_ERROR)) {

		if (fault & VM_FAULT_OOM)
@@ -211,15 +210,10 @@ asmlinkage void do_page_fault(unsigned long ecr, struct pt_regs *regs) 
	 */

out_of_memory:

	up_read(&mm->mmap_sem);

	if (is_global_init(current)) {

		yield();

		down_read(&mm->mmap_sem);

		goto survive;

	}

	printk("VM: Killing process %s\n", tsk->comm);

	if (user_mode(regs))

		do_group_exit(SIGKILL);

	pagefault_out_of_memory();

	if (!user_mode(regs))

		goto no_context;

	return;



do_sigbus:

	up_read(&mm->mmap_sem);