diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2016-10-16 11:31:39 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-10-16 11:31:39 +0200 |
| commit | 1d33369db25eb7f37b7a8bd22d736888b4501a9c (patch) | |
| tree | 116d764339be1bca928870151decbedc53a9e1d1 /mm/debug.c | |
| parent | x86/e820: Don't merge consecutive E820_PRAM ranges (diff) | |
| parent | Linux 4.9-rc1 (diff) | |
| download | wireguard-linux-1d33369db25eb7f37b7a8bd22d736888b4501a9c.tar.xz wireguard-linux-1d33369db25eb7f37b7a8bd22d736888b4501a9c.zip | |
Merge tag 'v4.9-rc1' into x86/urgent, to pick up updates
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/debug.c')
| -rw-r--r-- | mm/debug.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mm/debug.c b/mm/debug.c index 74c7cae4f683..9feb699c5d25 100644 --- a/mm/debug.c +++ b/mm/debug.c @@ -42,6 +42,11 @@ const struct trace_print_flags vmaflag_names[] = { void __dump_page(struct page *page, const char *reason) { + /* + * Avoid VM_BUG_ON() in page_mapcount(). + * page->_mapcount space in struct page is used by sl[aou]b pages to + * encode own info. + */ int mapcount = PageSlab(page) ? 0 : page_mapcount(page); pr_emerg("page:%p count:%d mapcount:%d mapping:%p index:%#lx", |