From: Chad Goodman <chad.goodman@gmail.com>
Date: Sun, 25 Nov 2012 09:53:56 +0000 (-0800)
Subject: OOM: dont kill kernel threads
X-Git-Url: https://ziggy471.com/git/gitweb.cgi?p=ziggy471-sgn2-jb.git;a=commitdiff;h=5885a3201ee7c44413538e86767e6ba2c7aec288

OOM: dont kill kernel threads

Signed-off-by: Ziggy <ziggy@ziggy471.com>
---

--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -725,9 +725,10 @@ void out_of_memory(struct zonelist *zone
 	check_panic_on_oom(constraint, gfp_mask, order, mpol_mask);
 
 	read_lock(&tasklist_lock);
-	if (sysctl_oom_kill_allocating_task &&
+	if (sysctl_oom_kill_allocating_task && current->mm &&
 	    !oom_unkillable_task(current, NULL, nodemask) &&
-	    current->mm && !atomic_read(&current->mm->oom_disable_count)) {
+	    current->signal->oom_score_adj != OOM_SCORE_ADJ_MIN &&
+	    !atomic_read(&current->mm->oom_disable_count)) {
 		/*
 		 * oom_kill_process() needs tasklist_lock held.  If it returns
 		 * non-zero, current could not be killed so we must fallback to