diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-03-04 11:23:48 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-03-04 20:29:35 +0100 |
| commit | 71c2ff150f34904f693c654ee8c55c996629abb7 (patch) | |
| tree | 9ae0281cc2069b564ddebf73400f5f90312868ca /arch/arm/include/asm/io.h | |
| parent | 1fff9f8730b00c39ec5055656e45ef69acd9409a (diff) | |
| parent | c8b584fe82d0f1e478a598f954943b095a4a8f5c (diff) | |
Merge branch 'x86/asm' into x86/core, to pick up dependent commits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/include/asm/io.h')
| -rw-r--r-- | arch/arm/include/asm/io.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h index 1815748f5d2a..bae5edf348ef 100644 --- a/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h @@ -381,7 +381,7 @@ void __iomem *ioremap_wc(resource_size_t res_cookie, size_t size); void iounmap(volatile void __iomem *io_addr); #define iounmap iounmap -void *arch_memremap_wb(phys_addr_t phys_addr, size_t size); +void *arch_memremap_wb(phys_addr_t phys_addr, size_t size, unsigned long flags); #define arch_memremap_wb arch_memremap_wb /* |