Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32e81674 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm: oom_kill: Prevent debug messages from going to serial console"

parents c69e8796 8bca80ab

mm/oom_kill.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -1256,12 +1256,10 @@ void add_to_oom_reaper(struct task_struct *p) 




	task_unlock(p);

	task_unlock(p);





	if (strcmp(current->comm, ULMK_MAGIC) && __ratelimit(&reaper_rs)

	if (!strcmp(current->comm, ULMK_MAGIC) && __ratelimit(&reaper_rs)

			&& p->signal->oom_score_adj == 0) {

			&& p->signal->oom_score_adj == 0) {

		show_mem(SHOW_MEM_FILTER_NODES, NULL);

		show_mem(SHOW_MEM_FILTER_NODES, NULL);

		show_mem_call_notifiers();

		show_mem_call_notifiers();

		if (sysctl_oom_dump_tasks)

			dump_tasks(NULL, NULL);

	}

	}





	put_task_struct(p);

	put_task_struct(p);