diff options
| author | Will Deacon <will@kernel.org> | 2021-10-29 12:27:53 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2021-10-29 12:27:53 +0100 |
| commit | e6359798f62da66a4a48061d2324a69ea59ff39b (patch) | |
| tree | 5695107ae49a82d8d80f8a0e72a9f40b7a8b1a96 /arch/arm64/mm | |
| parent | b2909a447ec3f3713b142bf8592733f51e4661fc (diff) | |
| parent | 596143e3aec35c93508d6b7a05ddc999ee209b61 (diff) | |
| download | linux-stable-e6359798f62da66a4a48061d2324a69ea59ff39b.tar.gz linux-stable-e6359798f62da66a4a48061d2324a69ea59ff39b.tar.bz2 linux-stable-e6359798f62da66a4a48061d2324a69ea59ff39b.zip | |
Merge branch 'for-next/fixes' into for-next/core
Merge for-next/fixes to resolve conflicts in arm64_hugetlb_cma_reserve().
* for-next/fixes:
acpi/arm64: fix next_platform_timer() section mismatch error
arm64/hugetlb: fix CMA gigantic page order for non-4K PAGE_SIZE
Diffstat (limited to 'arch/arm64/mm')
| -rw-r--r-- | arch/arm64/mm/hugetlbpage.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index 029cf5e42c4c..ffb9c229610a 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -43,7 +43,8 @@ void __init arm64_hugetlb_cma_reserve(void) if (pud_sect_supported()) order = PUD_SHIFT - PAGE_SHIFT; else - order = CONT_PMD_SHIFT + PMD_SHIFT - PAGE_SHIFT; + order = CONT_PMD_SHIFT - PAGE_SHIFT; + /* * HugeTLB CMA reservation is required for gigantic * huge pages which could not be allocated via the |