leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'for-next/fixes' into for-next/core

Browse Source 
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
This commit is contained in:
Will Deacon 2021-10-29 12:27:53 +01:00
commit e6359798f6
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm64/mm/hugetlbpage.c
View File

@ -43,7 +43,8 @@ void __init arm64_hugetlb_cma_reserve(void)
if (pud_sect_supported()) if (pud_sect_supported())
order = PUD_SHIFT - PAGE_SHIFT; order = PUD_SHIFT - PAGE_SHIFT;
else else
order = CONT_PMD_SHIFT + PMD_SHIFT - PAGE_SHIFT; order = CONT_PMD_SHIFT - PAGE_SHIFT;
/* /*
* HugeTLB CMA reservation is required for gigantic * HugeTLB CMA reservation is required for gigantic
* huge pages which could not be allocated via the * huge pages which could not be allocated via the

2
drivers/acpi/arm64/gtdt.c
View File

@ -36,7 +36,7 @@ struct acpi_gtdt_descriptor {
static struct acpi_gtdt_descriptor acpi_gtdt_desc __initdata; 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; struct acpi_gtdt_header *gh = platform_timer;