diff options
| author | Linus Torvalds | 2021-10-12 11:16:38 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2021-10-12 11:16:38 -0700 |
| commit | f4d0cc426f77df6890aa868f96c2de89686aae8a (patch) | |
| tree | ad620f9093d91971d4a5488214166f620aa8f8c6 /drivers | |
| parent | ed47291911d375f7d0bf63b9afb7516988305d94 (diff) | |
| parent | 596143e3aec35c93508d6b7a05ddc999ee209b61 (diff) | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/arm64/gtdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/arm64/gtdt.c b/drivers/acpi/arm64/gtdt.c index 0a0a982f9c28..c0e77c1c8e09 100644 --- a/drivers/acpi/arm64/gtdt.c +++ b/drivers/acpi/arm64/gtdt.c @@ -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; |