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

Commit 68db30ce authored by Nick Piggin's avatar Nick Piggin Committed by Linus Torvalds
Browse files

m32r: 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 avatarDavid Rientjes <rientjes@google.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f9c497c4

arch/m32r/mm/fault.c

+4 −10
Original line number Diff line number Diff line
@@ -188,7 +188,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code, 
	if ((error_code & ACE_INSTRUCTION) && !(vma->vm_flags & VM_EXEC))

	  goto bad_area;



survive:

	/*

	 * If for any reason at all we couldn't handle the fault,

	 * make sure we exit gracefully rather than endlessly redo
@@ -271,15 +270,10 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code, 
 */

out_of_memory:

	up_read(&mm->mmap_sem);

	if (is_global_init(tsk)) {

		yield();

		down_read(&mm->mmap_sem);

		goto survive;

	}

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

	if (error_code & ACE_USERMODE)

		do_group_exit(SIGKILL);

	if (!(error_code & ACE_USERMODE))

		goto no_context;

	pagefault_out_of_memory();

	return;



do_sigbus:

	up_read(&mm->mmap_sem);