Skip to content

Commit d199483

Browse files
sidkumar99akpm00
authored andcommitted
mm/hugetlb: rename dissolve_free_huge_pages() to dissolve_free_hugetlb_folios()
dissolve_free_huge_pages() only uses folios internally, rename it to dissolve_free_hugetlb_folios() and change the comments which reference it. [[email protected]: remove unneeded `extern'] Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Sidhartha Kumar <[email protected]> Reviewed-by: Vishal Moola (Oracle) <[email protected]> Reviewed-by: Miaohe Lin <[email protected]> Cc: Jane Chu <[email protected]> Cc: Matthew Wilcox (Oracle) <[email protected]> Cc: Muchun Song <[email protected]> Cc: Oscar Salvador <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 54fa49b commit d199483

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

include/linux/hugetlb.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,7 @@ static inline int hstate_index(struct hstate *h)
862862
}
863863

864864
int dissolve_free_hugetlb_folio(struct folio *folio);
865-
extern int dissolve_free_huge_pages(unsigned long start_pfn,
865+
int dissolve_free_hugetlb_folios(unsigned long start_pfn,
866866
unsigned long end_pfn);
867867

868868
#ifdef CONFIG_MEMORY_FAILURE
@@ -1153,7 +1153,7 @@ static inline int dissolve_free_hugetlb_folio(struct folio *folio)
11531153
return 0;
11541154
}
11551155

1156-
static inline int dissolve_free_huge_pages(unsigned long start_pfn,
1156+
static inline int dissolve_free_hugetlb_folios(unsigned long start_pfn,
11571157
unsigned long end_pfn)
11581158
{
11591159
return 0;

mm/hugetlb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2472,7 +2472,7 @@ int dissolve_free_hugetlb_folio(struct folio *folio)
24722472
* Also note that if dissolve_free_hugetlb_folio() returns with an error, all
24732473
* free hugetlb folios that were dissolved before that error are lost.
24742474
*/
2475-
int dissolve_free_huge_pages(unsigned long start_pfn, unsigned long end_pfn)
2475+
int dissolve_free_hugetlb_folios(unsigned long start_pfn, unsigned long end_pfn)
24762476
{
24772477
unsigned long pfn;
24782478
struct folio *folio;

mm/memory_hotplug.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2051,11 +2051,11 @@ int __ref offline_pages(unsigned long start_pfn, unsigned long nr_pages,
20512051
}
20522052

20532053
/*
2054-
* Dissolve free hugepages in the memory block before doing
2054+
* Dissolve free hugetlb folios in the memory block before doing
20552055
* offlining actually in order to make hugetlbfs's object
20562056
* counting consistent.
20572057
*/
2058-
ret = dissolve_free_huge_pages(start_pfn, end_pfn);
2058+
ret = dissolve_free_hugetlb_folios(start_pfn, end_pfn);
20592059
if (ret) {
20602060
reason = "failure to dissolve huge pages";
20612061
goto failed_removal_isolated;

0 commit comments

Comments
 (0)