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

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
parents b2909a44 596143e3

arch/arm64/mm/hugetlbpage.c

+2 −1
Original line number Diff line number Diff line
@@ -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

drivers/acpi/arm64/gtdt.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ struct acpi_gtdt_descriptor { 


static struct acpi_gtdt_descriptor acpi_gtdt_desc __initdata;



static inline void *next_platform_timer(void *platform_timer)

static inline __init void *next_platform_timer(void *platform_timer)

{

	struct acpi_gtdt_header *gh = platform_timer;