Messages in this thread Patch in this message | | | From | Anshuman Khandual <> | Subject | [PATCH] arm64/migration: Define arm64_hugetlb_valid_size() | Date | Mon, 7 Feb 2022 07:01:08 +0530 |
| |
arch_hugetlb_valid_size() can be just factored out to create another helper to be used in arch_hugetlb_migration_supported() as well. This just defines arm64_hugetlb_migration_supported() for that purpose.
Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will@kernel.org> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> --- arch/arm64/mm/hugetlbpage.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-)
diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index ffb9c229610a..dcdc4c0c3bd8 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -56,24 +56,12 @@ void __init arm64_hugetlb_cma_reserve(void) } #endif /* CONFIG_CMA */ +static bool arm64_hugetlb_valid_size(unsigned long size); + #ifdef CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION bool arch_hugetlb_migration_supported(struct hstate *h) { - size_t pagesize = huge_page_size(h); - - switch (pagesize) { -#ifndef __PAGETABLE_PMD_FOLDED - case PUD_SIZE: - return pud_sect_supported(); -#endif - case PMD_SIZE: - case CONT_PMD_SIZE: - case CONT_PTE_SIZE: - return true; - } - pr_warn("%s: unrecognized huge page size 0x%lx\n", - __func__, pagesize); - return false; + return arm64_hugetlb_valid_size(huge_page_size(h)); } #endif @@ -504,7 +492,7 @@ static int __init hugetlbpage_init(void) } arch_initcall(hugetlbpage_init); -bool __init arch_hugetlb_valid_size(unsigned long size) +static bool arm64_hugetlb_valid_size(unsigned long size) { switch (size) { #ifndef __PAGETABLE_PMD_FOLDED @@ -517,5 +505,12 @@ bool __init arch_hugetlb_valid_size(unsigned long size) return true; } + pr_warn("%s: unrecognized huge page size 0x%lx\n", + __func__, size); return false; } + +bool __init arch_hugetlb_valid_size(unsigned long size) +{ + return arm64_hugetlb_valid_size(size); +} -- 2.20.1
| |