diff mbox series

[03/15] logic_io instance of iounmap() needs volatile on argument

Message ID 20210920213301.1424730-3-viro@zeniv.linux.org.uk
State Accepted
Headers show
Series [01/15] uml: trim unused junk from arch/x86/um/sys_call_table_*.c | expand

Commit Message

Al Viro Sept. 20, 2021, 9:32 p.m. UTC 
... same as the rest of implementations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
 include/asm-generic/logic_io.h | 2 +-
 lib/logic_iomem.c              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/include/asm-generic/logic_io.h b/include/asm-generic/logic_io.h
index a53116b8c57ef..8a59b6e567df7 100644
--- a/include/asm-generic/logic_io.h
+++ b/include/asm-generic/logic_io.h
@@ -34,7 +34,7 @@ 
 void __iomem *ioremap(phys_addr_t offset, size_t size);
 
 #define iounmap iounmap
-void iounmap(void __iomem *addr);
+void iounmap(void volatile __iomem *addr);
 
 #define __raw_readb __raw_readb
 u8 __raw_readb(const volatile void __iomem *addr);
diff --git a/lib/logic_iomem.c b/lib/logic_iomem.c
index 9bdfde0c0f86d..bfb8053205b17 100644
--- a/lib/logic_iomem.c
+++ b/lib/logic_iomem.c
@@ -76,7 +76,7 @@  static void __iomem *real_ioremap(phys_addr_t offset, size_t size)
 	return NULL;
 }
 
-static void real_iounmap(void __iomem *addr)
+static void real_iounmap(volatile void __iomem *addr)
 {
 	WARN(1, "invalid iounmap for addr 0x%llx\n",
 	     (unsigned long long __force)addr);
@@ -149,7 +149,7 @@  get_area(const volatile void __iomem *addr)
 	return NULL;
 }
 
-void iounmap(void __iomem *addr)
+void iounmap(volatile void __iomem *addr)
 {
 	struct logic_iomem_area *area = get_area(addr);