diff options
| -rw-r--r-- | mm/oom_kill.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 3100bc57036..62a5cec08a1 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -549,6 +549,17 @@ void mem_cgroup_out_of_memory(struct mem_cgroup *mem, gfp_t gfp_mask) unsigned int points = 0; struct task_struct *p; + /* + * If current has a pending SIGKILL, then automatically select it. The + * goal is to allow it to allocate so that it may quickly exit and free + * its memory. + */ + if (fatal_signal_pending(current)) { + set_thread_flag(TIF_MEMDIE); + boost_dying_task_prio(current, NULL); + return; + } + check_panic_on_oom(CONSTRAINT_MEMCG, gfp_mask, 0, NULL); limit = mem_cgroup_get_limit(mem) >> PAGE_SHIFT; read_lock(&tasklist_lock); |