The quilt patch titled
Subject: mm/hugetlb: convert dissolve_free_huge_pages() to folios
has been removed from the -mm tree. Its filename was
mm-hugetlb-convert-dissolve_free_huge_pages-to-folios-v2.patch
This patch was dropped because it was folded into mm-hugetlb-convert-dissolve_free_huge_pages-to-folios.patch
------------------------------------------------------
From: Sidhartha Kumar <sidhartha.kumar@xxxxxxxxxx>
Subject: mm/hugetlb: convert dissolve_free_huge_pages() to folios
Date: Fri, 12 Apr 2024 11:21:38 -0700
Change additional comments which reference hugepages to hugetlb folios per
Miaohe Lin.
Link: https://lkml.kernel.org/r/20240412182139.120871-1-sidhartha.kumar@xxxxxxxxxx
Signed-off-by: Sidhartha Kumar <sidhartha.kumar@xxxxxxxxxx>
Reviewed-by: Oscar Salvador <osalvador@xxxxxxx>
Cc: Jane Chu <jane.chu@xxxxxxxxxx>
Cc: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
Cc: Miaohe Lin <linmiaohe@xxxxxxxxxx>
Cc: Muchun Song <muchun.song@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/hugetlb.c | 4 ++--
mm/memory-failure.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
--- a/mm/hugetlb.c~mm-hugetlb-convert-dissolve_free_huge_pages-to-folios-v2
+++ a/mm/hugetlb.c
@@ -2378,7 +2378,7 @@ static struct folio *remove_pool_hugetlb
/*
* Dissolve a given free hugetlb folio into free buddy pages. This function
- * does nothing for in-use hugepages and non-hugepages.
+ * does nothing for in-use hugetlb folios and non-hugetlb folios.
* This function returns values like below:
*
* -ENOMEM: failed to allocate vmemmap pages to free the freed hugepages
@@ -2470,7 +2470,7 @@ out:
* Note that this will dissolve a free gigantic hugepage completely, if any
* part of it lies within the given range.
* Also note that if dissolve_free_hugetlb_folio() returns with an error, all
- * free hugepages that were dissolved before that error are lost.
+ * free hugetlb folios that were dissolved before that error are lost.
*/
int dissolve_free_huge_pages(unsigned long start_pfn, unsigned long end_pfn)
{
--- a/mm/memory-failure.c~mm-hugetlb-convert-dissolve_free_huge_pages-to-folios-v2
+++ a/mm/memory-failure.c
@@ -178,8 +178,8 @@ static bool page_handle_poison(struct pa
{
if (hugepage_or_freepage) {
/*
- * Doing this check for free pages is also fine since dissolve_free_huge_page
- * returns 0 for non-hugetlb pages as well.
+ * Doing this check for free pages is also fine since
+ * dissolve_free_hugetlb_folio() returns 0 for non-hugetlb folios as well.
*/
if (__page_handle_poison(page) <= 0)
/*
_
Patches currently in -mm which might be from sidhartha.kumar@xxxxxxxxxx are
mm-hugetlb-convert-dissolve_free_huge_pages-to-folios.patch
mm-hugetlb-rename-dissolve_free_huge_pages-to-dissolve_free_hugetlb_folios.patch
