Commit f4d0cc42 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fixes from Catalin Marinas:

 - Fix CMA gigantic page order for 16K/64K page sizes

 - Fix section mismatch error in drivers/acpi/arm64/gtdt.c

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  acpi/arm64: fix next_platform_timer() section mismatch error
  arm64/hugetlb: fix CMA gigantic page order for non-4K PAGE_SIZE
parents ed472919 596143e3

arch/arm64/mm/hugetlbpage.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ void __init arm64_hugetlb_cma_reserve(void) 
#ifdef CONFIG_ARM64_4K_PAGES

	order = PUD_SHIFT - PAGE_SHIFT;

#else

	order = CONT_PMD_SHIFT + PMD_SHIFT - PAGE_SHIFT;

	order = CONT_PMD_SHIFT - PAGE_SHIFT;

#endif

	/*

	 * HugeTLB CMA reservation is required for gigantic

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;