MIPS: Port "mm: invoke oom-killer from page fault" from UML / x86
Original commit 1c0fe6e3bd
.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
parent
a8ca8b64e3
commit
c7c1e3846b
|
@ -97,7 +97,6 @@ good_area:
|
||||||
goto bad_area;
|
goto bad_area;
|
||||||
}
|
}
|
||||||
|
|
||||||
survive:
|
|
||||||
/*
|
/*
|
||||||
* If for any reason at all we couldn't handle the fault,
|
* If for any reason at all we couldn't handle the fault,
|
||||||
* make sure we exit gracefully rather than endlessly redo
|
* make sure we exit gracefully rather than endlessly redo
|
||||||
|
@ -167,21 +166,13 @@ no_context:
|
||||||
field, regs->regs[31]);
|
field, regs->regs[31]);
|
||||||
die("Oops", regs);
|
die("Oops", regs);
|
||||||
|
|
||||||
/*
|
|
||||||
* We ran out of memory, or some other thing happened to us that made
|
|
||||||
* us unable to handle the page fault gracefully.
|
|
||||||
*/
|
|
||||||
out_of_memory:
|
out_of_memory:
|
||||||
up_read(&mm->mmap_sem);
|
/*
|
||||||
if (is_global_init(tsk)) {
|
* We ran out of memory, call the OOM killer, and return the userspace
|
||||||
yield();
|
* (which will retry the fault, or kill us if we got oom-killed).
|
||||||
down_read(&mm->mmap_sem);
|
*/
|
||||||
goto survive;
|
pagefault_out_of_memory();
|
||||||
}
|
return;
|
||||||
printk("VM: killing process %s\n", tsk->comm);
|
|
||||||
if (user_mode(regs))
|
|
||||||
do_group_exit(SIGKILL);
|
|
||||||
goto no_context;
|
|
||||||
|
|
||||||
do_sigbus:
|
do_sigbus:
|
||||||
up_read(&mm->mmap_sem);
|
up_read(&mm->mmap_sem);
|
||||||
|
|
Loading…
Reference in New Issue