diff options
author | Will Deacon <will@kernel.org> | 2022-07-25 10:56:23 +0100 |
---|---|---|
committer | Will Deacon <will@kernel.org> | 2022-07-25 10:56:23 +0100 |
commit | 84d8857af43a9d4289c53955f4d221ebda548b97 (patch) | |
tree | 519114c6a4f8f36bf571cda6ad5eab798259aece /arch/arm64/kernel | |
parent | ee8b00a956e104e7cf52bb138ab597bf32ec46fc (diff) | |
parent | 893dea9ccd08dab924839354aba21d4ed7a9abc0 (diff) | |
download | linux-84d8857af43a9d4289c53955f4d221ebda548b97.tar.bz2 |
Merge branch 'for-next/ioremap' into for-next/core
* for-next/ioremap:
arm64: Add HAVE_IOREMAP_PROT support
arm64: mm: Convert to GENERIC_IOREMAP
mm: ioremap: Add ioremap/iounmap_allowed()
mm: ioremap: Setup phys_addr of struct vm_struct
mm: ioremap: Use more sensible name in ioremap_prot()
ARM: mm: kill unused runtime hook arch_iounmap()
Diffstat (limited to 'arch/arm64/kernel')
-rw-r--r-- | arch/arm64/kernel/acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c index e4dea8db6924..a5a256e3f9fe 100644 --- a/arch/arm64/kernel/acpi.c +++ b/arch/arm64/kernel/acpi.c @@ -351,7 +351,7 @@ void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size) prot = __acpi_get_writethrough_mem_attribute(); } } - return __ioremap(phys, size, prot); + return ioremap_prot(phys, size, pgprot_val(prot)); } /* |