diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-09-21 15:01:57 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-09-21 15:01:57 +0200 |
| commit | 580498a23be1de55be55147eaee20a69249aeb13 (patch) | |
| tree | 345f1a280812bf15969ae7097583b7dd59482636 /mm/debug.c | |
| parent | 3ec979658e5cc0fab86a42af79a650299e4d7135 (diff) | |
| parent | 7d1e042314619115153a0f6f06e4552c09a50e13 (diff) | |
Merge branch 'linus' into x86/boot, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/debug.c')
| -rw-r--r-- | mm/debug.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mm/debug.c b/mm/debug.c index 8865bfb41b0b..74c7cae4f683 100644 --- a/mm/debug.c +++ b/mm/debug.c @@ -42,9 +42,11 @@ const struct trace_print_flags vmaflag_names[] = { void __dump_page(struct page *page, const char *reason) { + int mapcount = PageSlab(page) ? 0 : page_mapcount(page); + pr_emerg("page:%p count:%d mapcount:%d mapping:%p index:%#lx", - page, page_ref_count(page), page_mapcount(page), - page->mapping, page->index); + page, page_ref_count(page), mapcount, + page->mapping, page_to_pgoff(page)); if (PageCompound(page)) pr_cont(" compound_mapcount: %d", compound_mapcount(page)); pr_cont("\n"); |