Merge "mm: oom: wait for exit of killed current task" (67a89051) · Commits · e / devices / android_kernel_fairphone_FP5

mm/oom_kill.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -1160,6 +1160,10 @@ bool out_of_memory(struct oom_control *oc)
		CONFIG_OOM_TASK_PRIORITY_ADJ_LIMIT);
		oc->min_kill_adj = prev_min_kill_adj;
		oc->chosen_points = 0;
		if (tsk_is_oom_victim(current)) {
		pr_warn_ratelimited("current killed, retry\n");
		return true;
		}
		}

		}