The quilt patch titled
Subject: mm-add-__dump_folio-fix
has been removed from the -mm tree. Its filename was
mm-add-__dump_folio-fix.patch
This patch was dropped because it was folded into mm-add-__dump_folio.patch
------------------------------------------------------
From: Matthew Wilcox <willy@xxxxxxxxxxxxx>
Subject: mm-add-__dump_folio-fix
Date: Thu, 29 Feb 2024 04:37:31 +0000
fix build issue
Link: https://lkml.kernel.org/r/ZeAKCyTn_xS3O9cE@xxxxxxxxxxxxxxxxxxxx
Signed-off-by: Matthew Wilcox <willy@xxxxxxxxxxxxx>
Reported-by: SeongJae Park <sj@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/mm.h | 7 +++++++
mm/debug.c | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
--- a/include/linux/mm.h~mm-add-__dump_folio-fix
+++ a/include/linux/mm.h
@@ -2066,6 +2066,13 @@ static inline long folio_nr_pages(struct
#endif
}
+/* Only hugetlbfs can allocate folios larger than MAX_ORDER */
+#ifdef CONFIG_ARCH_HAS_GIGANTIC_PAGE
+#define MAX_FOLIO_NR_PAGES (1UL << PUD_ORDER)
+#else
+#define MAX_FOLIO_NR_PAGES MAX_ORDER_NR_PAGES
+#endif
+
/*
* compound_nr() returns the number of pages in this potentially compound
* page. compound_nr() can be called on a tail page, and is defined to
--- a/mm/debug.c~mm-add-__dump_folio-fix
+++ a/mm/debug.c
@@ -125,7 +125,7 @@ again:
foliop = page_folio(&precise);
idx = folio_page_idx(foliop, page);
if (idx != 0) {
- if (idx < (1UL << PUD_ORDER)) {
+ if (idx < MAX_FOLIO_NR_PAGES) {
memcpy(&folio, foliop, 2 * sizeof(struct page));
nr_pages = folio_nr_pages(&folio);
}
_
Patches currently in -mm which might be from willy@xxxxxxxxxxxxx are
mm-separate-out-folio_flags-from-pageflags.patch
mm-remove-pagewaiters-pagesetwaiters-and-pageclearwaiters.patch
mm-remove-pageyoung-and-pageidle-definitions.patch
mm-add-__dump_folio.patch
mm-add-__dump_folio-fix-2.patch
mm-add-__dump_folio-fix-3.patch
mm-make-dump_page-take-a-const-argument.patch
mm-constify-testing-page-folio-flags.patch
mm-constify-more-page-folio-tests.patch
mm-remove-cast-from-page_to_nid.patch
mm-mempolicy-use-a-folio-in-do_mbind.patch
