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

diff --cc arch/arm64/mm/hugetlbpage.c
index 029cf5e42c4ce84ceccef2f0f81aa55a5e3098b2,a8158c9489666819b5d2a70034c3c645e512bc1f..ffb9c229610ab5ee0825f1c604f72799bd7296e1
--- 1/arch/arm64/mm/hugetlbpage.c
--- 2/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