nios2: mm: do not invoke OOM killer on kernel fault OOM
Follow commit 871341023c
.
Kernel faults are expected to handle OOM conditions gracefully (gup,
uaccess etc.), so they should never invoke the OOM killer. Reserve
this for faults triggered in user context when it is the only option.
Signed-off-by: Ley Foon Tan <lftan@altera.com>
This commit is contained in:
parent
c105e86ace
commit
6347e2a10f
1 changed files with 0 additions and 6 deletions
|
@ -126,7 +126,6 @@ good_area:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
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
|
||||||
|
@ -220,11 +219,6 @@ no_context:
|
||||||
*/
|
*/
|
||||||
out_of_memory:
|
out_of_memory:
|
||||||
up_read(&mm->mmap_sem);
|
up_read(&mm->mmap_sem);
|
||||||
if (is_global_init(tsk)) {
|
|
||||||
yield();
|
|
||||||
down_read(&mm->mmap_sem);
|
|
||||||
goto survive;
|
|
||||||
}
|
|
||||||
if (!user_mode(regs))
|
if (!user_mode(regs))
|
||||||
goto no_context;
|
goto no_context;
|
||||||
pagefault_out_of_memory();
|
pagefault_out_of_memory();
|
||||||
|
|
Loading…
Add table
Reference in a new issue