diff options
| -rw-r--r-- | mm/oom_kill.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 907e2c0ad7a6..64cdacad83d9 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -645,6 +645,16 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, /* Got some memory back in the last second. */ return; + /* + * 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); + return; + } + if (sysctl_panic_on_oom == 2) { dump_header(NULL, gfp_mask, order, NULL); panic("out of memory. Compulsory panic_on_oom is selected.\n"); |
