From: Will Deacon <will@kernel.org>
Date: Fri, 29 Oct 2021 11:27:53 +0000 (+0100)
Subject: Merge branch 'for-next/fixes' into for-next/core
X-Git-Tag: v6.6.17~8859^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e6359798f62da66a4a48061d2324a69ea59ff39b;p=platform%2Fkernel%2Flinux-rpi.git

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
---

e6359798f62da66a4a48061d2324a69ea59ff39b
diff --cc arch/arm64/mm/hugetlbpage.c
index 029cf5e,a8158c9..ffb9c22
--- a/arch/arm64/mm/hugetlbpage.c
+++ b/arch/arm64/mm/hugetlbpage.c
@@@ -40,10 -40,11 +40,11 @@@ void __init arm64_hugetlb_cma_reserve(v
  {
  	int order;
  
 -#ifdef CONFIG_ARM64_4K_PAGES
 -	order = PUD_SHIFT - PAGE_SHIFT;
 -#else
 -	order = CONT_PMD_SHIFT - PAGE_SHIFT;
 -#endif
 +	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