Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab2e1b89 authored by Will Deacon's avatar Will Deacon
Browse files

Revert "arm64: hugetlb: partial revert of 66b3923a" 



This reverts commit ff792584.

Now that the contiguous-hint hugetlb regression has been debugged and
fixed upstream by 66ee95d1 ("mm: exclude HugeTLB pages from THP
page_mapped() logic"), we can revert the previous partial revert of this
feature.

Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 1a695a90

arch/arm64/mm/hugetlbpage.c

+14 −0
Original line number Diff line number Diff line
@@ -306,6 +306,10 @@ static __init int setup_hugepagesz(char *opt) 
		hugetlb_add_hstate(PMD_SHIFT - PAGE_SHIFT);

	} else if (ps == PUD_SIZE) {

		hugetlb_add_hstate(PUD_SHIFT - PAGE_SHIFT);

	} else if (ps == (PAGE_SIZE * CONT_PTES)) {

		hugetlb_add_hstate(CONT_PTE_SHIFT);

	} else if (ps == (PMD_SIZE * CONT_PMDS)) {

		hugetlb_add_hstate((PMD_SHIFT + CONT_PMD_SHIFT) - PAGE_SHIFT);

	} else {

		hugetlb_bad_size();

		pr_err("hugepagesz: Unsupported page size %lu K\n", ps >> 10);
@@ -314,3 +318,13 @@ static __init int setup_hugepagesz(char *opt) 
	return 1;

}

__setup("hugepagesz=", setup_hugepagesz);



#ifdef CONFIG_ARM64_64K_PAGES

static __init int add_default_hugepagesz(void)

{

	if (size_to_hstate(CONT_PTES * PAGE_SIZE) == NULL)

		hugetlb_add_hstate(CONT_PMD_SHIFT);

	return 0;

}

arch_initcall(add_default_hugepagesz);

#endif