aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/mm/debug.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2021-05-04 11:46:00 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2021-05-04 11:46:00 -0700
commitd0034a7a4ac7fae708146ac0059b9c47a1543f0d (patch)
treeac3ac88066f0f80632aa754e3ae008994f2426a2 /mm/debug.c
parentInput: elants_i2c - drop zero-checking of ABS_MT_TOUCH_MAJOR resolution (diff)
parentMAINTAINERS: repair reference in HYCON HY46XX TOUCHSCREEN SUPPORT (diff)
downloadwireguard-linux-d0034a7a4ac7fae708146ac0059b9c47a1543f0d.tar.xz
wireguard-linux-d0034a7a4ac7fae708146ac0059b9c47a1543f0d.zip
Merge branch 'next' into for-linus
Prepare input updates for 5.13 merge window.
Diffstat (limited to 'mm/debug.c')
-rw-r--r--mm/debug.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/mm/debug.c b/mm/debug.c
index 8a40b3fefbeb..0bdda8407f71 100644
--- a/mm/debug.c
+++ b/mm/debug.c
@@ -110,6 +110,11 @@ void __dump_page(struct page *page, const char *reason)
head_compound_mapcount(head));
}
}
+
+#ifdef CONFIG_MEMCG
+ if (head->memcg_data)
+ pr_warn("memcg:%lx\n", head->memcg_data);
+#endif
if (PageKsm(page))
type = "ksm ";
else if (PageAnon(page))
@@ -180,11 +185,6 @@ hex_only:
if (reason)
pr_warn("page dumped because: %s\n", reason);
-
-#ifdef CONFIG_MEMCG
- if (!page_poisoned && page->memcg_data)
- pr_warn("pages's memcg:%lx\n", page->memcg_data);
-#endif
}
void dump_page(struct page *page, const char *reason)