Skip to content

Commit

Permalink
MIPS: Port "mm: invoke oom-killer from page fault" from UML / x86
Browse files Browse the repository at this point in the history
Original commit 1c0fe6e.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Ralf Baechle committed Jan 30, 2009
1 parent a8ca8b6 commit c7c1e38
Showing 1 changed file with 6 additions and 15 deletions.
21 changes: 6 additions & 15 deletions arch/mips/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -167,21 +166,13 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write,
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);
Expand Down

0 comments on commit c7c1e38

Please sign in to comment.