MIPS: Port "mm: invoke oom-killer from page fault" from UML / x86 (c7c1e384) · Commits · e / devices / android_kernel_teracube_2e

arch/mips/mm/fault.c

+6 −15

Original line number	Diff line number	Diff line
		@@ -97,7 +97,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write,
		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
		@@ -167,21 +166,13 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write,
		field, regs->regs[31]);
		die("Oops", regs);

		out_of_memory:
		/*
		* We ran out of memory, or some other thing happened to us that made
		* us unable to handle the page fault gracefully.
		* We ran out of memory, call the OOM killer, and return the userspace
		* (which will retry the fault, or kill us if we got oom-killed).
		*/
		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 (user_mode(regs))
		do_group_exit(SIGKILL);
		goto no_context;
		pagefault_out_of_memory();
		return;

		do_sigbus:
		up_read(&mm->mmap_sem);