oom: oom_kill_process() needs to check that p is unkillable
[sfrench/cifs-2.6.git] / mm / oom_kill.c
index 2c993e47487f9d0d9e40dc1527fc38fc26007dcf..3999747aef48bb390a6ea3c8d7ff66ac550e8993 100644 (file)
@@ -687,7 +687,8 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask,
        check_panic_on_oom(constraint, gfp_mask, order);
 
        read_lock(&tasklist_lock);
-       if (sysctl_oom_kill_allocating_task) {
+       if (sysctl_oom_kill_allocating_task &&
+           !oom_unkillable_task(current, NULL, nodemask)) {
                /*
                 * oom_kill_process() needs tasklist_lock held.  If it returns
                 * non-zero, current could not be killed so we must fallback to