mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 15:47:36 +00:00
Code Issues Releases Wiki Activity

microblaze: fix iounmap prototype

Browse source 
The missing 'volatile' keyword on the iounmap argument leads to lots of
harmless warnings in an allmodconfig build:

sound/pci/echoaudio/echoaudio.c:1879:10: warning: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Wdiscarded-qualifiers]

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Arnd Bergmann 2018-01-02 12:47:20 +01:00 committed by Michal Simek
parent 71e7673dad
commit 2c957902b1
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/microblaze/include/asm/io.h
View file

@ -36,7 +36,7 @@ extern resource_size_t isa_mem_base;
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
#define page_to_bus(page) (page_to_phys(page)) #define page_to_bus(page) (page_to_phys(page))
extern void iounmap(void __iomem *addr); extern void iounmap(volatile void __iomem *addr);
extern void __iomem *ioremap(phys_addr_t address, unsigned long size); extern void __iomem *ioremap(phys_addr_t address, unsigned long size);
#define ioremap_nocache(addr, size) ioremap((addr), (size)) #define ioremap_nocache(addr, size) ioremap((addr), (size))

2
arch/microblaze/mm/pgtable.c
View file

@ -127,7 +127,7 @@ void __iomem *ioremap(phys_addr_t addr, unsigned long size)
} }
EXPORT_SYMBOL(ioremap); EXPORT_SYMBOL(ioremap);
void iounmap(void __iomem *addr) void iounmap(volatile void __iomem *addr)
{ {
if ((__force void *)addr > high_memory && if ((__force void *)addr > high_memory &&
(unsigned long) addr < ioremap_bot) (unsigned long) addr < ioremap_bot)