Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-21 19:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

logic_io instance of iounmap() needs volatile on argument

Browse Source 
... same as the rest of implementations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Al Viro 2021-09-20 21:32:49 +00:00 committed by Richard Weinberger
parent 577ade59b9
commit 5f174ec3c1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/asm-generic/logic_io.h
View File

@ -34,7 +34,7 @@
void __iomem *ioremap(phys_addr_t offset, size_t size); void __iomem *ioremap(phys_addr_t offset, size_t size);
#define iounmap iounmap #define iounmap iounmap
void iounmap(void __iomem *addr); void iounmap(void volatile __iomem *addr);
#define __raw_readb __raw_readb #define __raw_readb __raw_readb
u8 __raw_readb(const volatile void __iomem *addr); u8 __raw_readb(const volatile void __iomem *addr);

4
lib/logic_iomem.c
View File

@ -76,7 +76,7 @@ static void __iomem *real_ioremap(phys_addr_t offset, size_t size)
return NULL; 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", WARN(1, "invalid iounmap for addr 0x%llx\n",
(unsigned long long)(uintptr_t __force)addr); (unsigned long long)(uintptr_t __force)addr);
@ -149,7 +149,7 @@ get_area(const volatile void __iomem *addr)
return NULL; return NULL;
} }
void iounmap(void __iomem *addr) void iounmap(volatile void __iomem *addr)
{ {
struct logic_iomem_area *area = get_area(addr); struct logic_iomem_area *area = get_area(addr);