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

Commit e81a1a39 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm: run the showmem notifier in alloc failure"

parents b63d1005 1206f76c
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@
#include <linux/page_owner.h>
#include <linux/kthread.h>
#include <linux/memcontrol.h>
#include <linux/show_mem_notifier.h>

#include <asm/sections.h>
#include <asm/tlbflush.h>
@@ -3130,8 +3131,10 @@ void warn_alloc(gfp_t gfp_mask, const char *fmt, ...)
	pr_cont(", mode:%#x(%pGg)\n", gfp_mask, &gfp_mask);

	dump_stack();
	if (!should_suppress_show_mem())
	if (!should_suppress_show_mem()) {
		show_mem(filter);
		show_mem_call_notifiers();
	}
}

static inline struct page *