diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2009-01-12 00:09:13 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2009-01-30 21:32:57 +0000 |
| commit | c7c1e3846bac1e4b8a8941f6a194812e28b0a519 (patch) | |
| tree | 03d5341b460dee49e4aeafd1f1df73f68c5abbb1 /arch/mips/mm/fault.c | |
| parent | a8ca8b64e3fdfec17679cba0ca5ce6e3ffed092d (diff) | |
| download | linux-c7c1e3846bac1e4b8a8941f6a194812e28b0a519.tar.gz linux-c7c1e3846bac1e4b8a8941f6a194812e28b0a519.tar.bz2 linux-c7c1e3846bac1e4b8a8941f6a194812e28b0a519.zip | |
MIPS: Port "mm: invoke oom-killer from page fault" from UML / x86
Original commit 1c0fe6e3bda0464728c23c8d84aa47567e8b716c.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/mm/fault.c')
| -rw-r--r-- | arch/mips/mm/fault.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c index fa636fc6b7b9..55767ad9f00e 100644 --- a/arch/mips/mm/fault.c +++ b/arch/mips/mm/fault.c @@ -97,7 +97,6 @@ good_area: 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 @@ no_context: field, regs->regs[31]); 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: - 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; + /* + * 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). + */ + pagefault_out_of_memory(); + return; do_sigbus: up_read(&mm->mmap_sem); |