diff options
| author | Mark Brown <broonie@kernel.org> | 2018-09-20 08:32:20 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-09-20 08:32:20 -0700 |
| commit | d7b33ebae7c1419ebdfd94eb64bf74a7ec760031 (patch) | |
| tree | 67dbc2149bb00e2eaf89c31a515e1f8bfc0dc8cb /arch/mips/include/asm/io.h | |
| parent | e1d176680ed4f6970582086191eb7377a80a2d4e (diff) | |
| parent | 1244bbb3e92135d247e2dddfa6fe5e3e171a9635 (diff) | |
Merge tag 'v4.14.71' into linux-linaro-lsk-v4.14
This is the 4.14.71 stable release
Diffstat (limited to 'arch/mips/include/asm/io.h')
| -rw-r--r-- | arch/mips/include/asm/io.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h index cea8ad864b3f..57b34257be2b 100644 --- a/arch/mips/include/asm/io.h +++ b/arch/mips/include/asm/io.h @@ -141,14 +141,14 @@ static inline void * phys_to_virt(unsigned long address) /* * ISA I/O bus memory addresses are 1:1 with the physical address. */ -static inline unsigned long isa_virt_to_bus(volatile void * address) +static inline unsigned long isa_virt_to_bus(volatile void *address) { - return (unsigned long)address - PAGE_OFFSET; + return virt_to_phys(address); } -static inline void * isa_bus_to_virt(unsigned long address) +static inline void *isa_bus_to_virt(unsigned long address) { - return (void *)(address + PAGE_OFFSET); + return phys_to_virt(address); } #define isa_page_to_bus page_to_phys |