Merge "mm/oom_kill: Online memory before running oom-killer" (c08fc62d) · Commits · e / devices / android_kernel_fairphone_FP5

mm/oom_kill.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -1090,6 +1090,13 @@ bool out_of_memory(struct oom_control *oc)

		if (oom_killer_disabled)
		return false;

		if (try_online_one_block(numa_node_id())) {
		/* Got some memory back */
		WARN(1, "OOM killer had to online a memory block\n");
		return true;
		}

		#ifdef CONFIG_PRIORITIZE_OOM_TASKS
		oc->min_kill_adj = OOM_SCORE_ADJ_MIN;
		#endif
		@@ -1157,11 +1164,6 @@ bool out_of_memory(struct oom_control *oc)
		#endif

		if (!oc->chosen) {
		if (try_online_one_block(numa_node_id())) {
		/* Got some memory back */
		WARN(1, "OOM killer had to online a memory block\n");
		return true;
		}
		check_panic_on_oom(oc);
		select_bad_process(oc);
		}