diff options
| author | Ley Foon Tan <lftan@altera.com> | 2015-03-16 15:35:25 +0800 |
|---|---|---|
| committer | Ley Foon Tan <lftan@altera.com> | 2015-03-16 15:35:25 +0800 |
| commit | 6347e2a10f7031dc3725e6f4519089517c0ca521 (patch) | |
| tree | 5c2156ea9bb48eea0224ca7fe4f5db22dcd0ed48 | |
| parent | c105e86ace5a32ee4760a502bc45dcd26fed2375 (diff) | |
| download | tz1090-6347e2a10f7031dc3725e6f4519089517c0ca521.tar.gz | |
nios2: mm: do not invoke OOM killer on kernel fault OOM
Follow commit 871341023c771ad.
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>
| -rw-r--r-- | arch/nios2/mm/fault.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/nios2/mm/fault.c b/arch/nios2/mm/fault.c index 0d231adfe576b8..0c9b6afe69e909 100644 --- a/arch/nios2/mm/fault.c +++ b/arch/nios2/mm/fault.c @@ -126,7 +126,6 @@ good_area: break; } -survive: /* * If for any reason at all we couldn't handle the fault, * make sure we exit gracefully rather than endlessly redo @@ -220,11 +219,6 @@ no_context: */ out_of_memory: up_read(&mm->mmap_sem); - if (is_global_init(tsk)) { - yield(); - down_read(&mm->mmap_sem); - goto survive; - } if (!user_mode(regs)) goto no_context; pagefault_out_of_memory(); |