The quilt patch titled
Subject: mm-shmem-support-large-folio-allocation-for-shmem_replace_folio-fix-fix
has been removed from the -mm tree. Its filename was
mm-shmem-support-large-folio-allocation-for-shmem_replace_folio-fix-fix.patch
This patch was dropped because it was folded into mm-shmem-support-large-folio-allocation-for-shmem_replace_folio.patch
------------------------------------------------------
From: Baolin Wang <baolin.wang@xxxxxxxxxxxxxxxxx>
Subject: mm-shmem-support-large-folio-allocation-for-shmem_replace_folio-fix-fix
Date: Wed, 28 Aug 2024 18:17:18 +0800
fix build without CONFIG_TRANSPARENT_HUGEPAGE
ERROR:root:/usr/bin/ld: mm/shmem.o: in function `shmem_swapin_folio':
shmem.c:(.text+0x12d9): undefined reference to `vma_thp_gfp_mask'
collect2: error: ld returned 1 exit status
Link: https://lkml.kernel.org/r/8c03467c-63b2-43b4-9851-222d4188725c@xxxxxxxxxxxxxxxxx
Signed-off-by: Baolin Wang <baolin.wang@xxxxxxxxxxxxxxxxx>
Reported-by: SeongJae Park <sj@xxxxxxxxxx>, Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/shmem.c | 2 ++
1 file changed, 2 insertions(+)
--- a/mm/shmem.c~mm-shmem-support-large-folio-allocation-for-shmem_replace_folio-fix-fix
+++ a/mm/shmem.c
@@ -1899,11 +1899,13 @@ static int shmem_replace_folio(struct fo
* limit chance of success by further cpuset and node constraints.
*/
gfp &= ~GFP_CONSTRAINT_MASK;
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
if (nr_pages > 1) {
gfp_t huge_gfp = vma_thp_gfp_mask(vma);
gfp = limit_gfp_mask(huge_gfp, gfp);
}
+#endif
new = shmem_alloc_folio(gfp, folio_order(old), info, index);
if (!new)
_
Patches currently in -mm which might be from baolin.wang@xxxxxxxxxxxxxxxxx are
mm-swap-extend-swap_shmem_alloc-to-support-batch-swap_map_shmem-flag-setting.patch
mm-shmem-extend-shmem_partial_swap_usage-to-support-large-folio-swap.patch
mm-filemap-use-xa_get_order-to-get-the-swap-entry-order.patch
mm-shmem-use-swap_free_nr-to-free-shmem-swap-entries.patch
mm-shmem-support-large-folio-allocation-for-shmem_replace_folio.patch
mm-shmem-drop-folio-reference-count-using-nr_pages-in-shmem_delete_from_page_cache.patch
mm-shmem-split-large-entry-if-the-swapin-folio-is-not-large.patch
mm-shmem-split-large-entry-if-the-swapin-folio-is-not-large-fix-2.patch
mm-shmem-support-large-folio-swap-out.patch
mm-shmem-support-large-folio-swap-out-fix-2.patch
mm-khugepaged-expand-the-is_refcount_suitable-to-support-file-folios.patch
mm-khugepaged-use-the-number-of-pages-in-the-folio-to-check-the-reference-count.patch
mm-khugepaged-support-shmem-mthp-copy.patch
mm-khugepaged-support-shmem-mthp-collapse.patch
selftests-mm-support-shmem-mthp-collapse-testing.patch
