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

Commit 4f0fc020 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm, oom: run the showmem notifier in oom"

parents ecf79fe6 f42a145d

mm/oom_kill.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include <linux/init.h>

#include <linux/init.h>

#include <linux/mmu_notifier.h>

#include <linux/mmu_notifier.h>

#include <linux/memory_hotplug.h>

#include <linux/memory_hotplug.h>

#include <linux/show_mem_notifier.h>





#include <asm/tlb.h>

#include <asm/tlb.h>

#include "internal.h"

#include "internal.h"
@@ -447,7 +448,10 @@ static void dump_header(struct oom_control *oc, struct task_struct *p) 
		show_mem(SHOW_MEM_FILTER_NODES, oc->nodemask);

		show_mem(SHOW_MEM_FILTER_NODES, oc->nodemask);

		if (is_dump_unreclaim_slabs())

		if (is_dump_unreclaim_slabs())

			dump_unreclaimable_slab();

			dump_unreclaimable_slab();



		show_mem_call_notifiers();

	}

	}



	if (sysctl_oom_dump_tasks)

	if (sysctl_oom_dump_tasks)

		dump_tasks(oc->memcg, oc->nodemask);

		dump_tasks(oc->memcg, oc->nodemask);

}

}