summaryrefslogtreecommitdiff
path: root/mm/debug.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2025-08-03 23:28:48 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2025-08-03 23:28:48 -0700
commita7bee4e7f78089c101be2ad51f4b5ec64782053e (patch)
tree01c730cd0a71026fb1e74d601e1cbb4d0143126a /mm/debug.c
parent61c6fef7c4b06b4bdbf3142f4e5cace70597e0de (diff)
parent45ee66c37f9bd8cff7718c70d84e0291d385a093 (diff)
Merge tag 'ib-mfd-gpio-input-pwm-v6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into next
Merge an immutable branch between MFD, GPIO, Input and PWM to resolve conflicts for the merge window pull request.
Diffstat (limited to 'mm/debug.c')
-rw-r--r--mm/debug.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/mm/debug.c b/mm/debug.c
index db83e381a8ae..907382257062 100644
--- a/mm/debug.c
+++ b/mm/debug.c
@@ -71,10 +71,12 @@ static void __dump_folio(struct folio *folio, struct page *page,
unsigned long pfn, unsigned long idx)
{
struct address_space *mapping = folio_mapping(folio);
- int mapcount = atomic_read(&page->_mapcount);
+ int mapcount = atomic_read(&page->_mapcount) + 1;
char *type = "";
- mapcount = page_mapcount_is_type(mapcount) ? 0 : mapcount + 1;
+ if (page_mapcount_is_type(mapcount))
+ mapcount = 0;
+
pr_warn("page: refcount:%d mapcount:%d mapping:%p index:%#lx pfn:%#lx\n",
folio_ref_count(folio), mapcount, mapping,
folio->index + idx, pfn);