| Message ID | 20190817073253.27819-20-hch@lst.de (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [01/26] mtd/maps/pxa2xx: use ioremap_cache insted of ioremap_cached | expand |
On Sat, Aug 17, 2019 at 09:32:46AM +0200, Christoph Hellwig wrote: > No need to indirect iounmap for arm64. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > arch/arm64/include/asm/io.h | 3 +-- > arch/arm64/mm/ioremap.c | 4 ++-- > 2 files changed, 3 insertions(+), 4 deletions(-) Not sure why we did it like this... Acked-by: Will Deacon <will@kernel.org> Will
On Mon, Aug 19, 2019 at 08:36:02AM +0100, Will Deacon wrote: > On Sat, Aug 17, 2019 at 09:32:46AM +0200, Christoph Hellwig wrote: > > No need to indirect iounmap for arm64. > > > > Signed-off-by: Christoph Hellwig <hch@lst.de> > > --- > > arch/arm64/include/asm/io.h | 3 +-- > > arch/arm64/mm/ioremap.c | 4 ++-- > > 2 files changed, 3 insertions(+), 4 deletions(-) > > Not sure why we did it like this... > > Acked-by: Will Deacon <will@kernel.org> Can you just pick this one up through the arm64 tree for 5.4?
Hi Christoph, On Fri, Aug 30, 2019 at 06:05:15PM +0200, Christoph Hellwig wrote: > On Mon, Aug 19, 2019 at 08:36:02AM +0100, Will Deacon wrote: > > On Sat, Aug 17, 2019 at 09:32:46AM +0200, Christoph Hellwig wrote: > > > No need to indirect iounmap for arm64. > > > > > > Signed-off-by: Christoph Hellwig <hch@lst.de> > > > --- > > > arch/arm64/include/asm/io.h | 3 +-- > > > arch/arm64/mm/ioremap.c | 4 ++-- > > > 2 files changed, 3 insertions(+), 4 deletions(-) > > > > Not sure why we did it like this... > > > > Acked-by: Will Deacon <will@kernel.org> > > Can you just pick this one up through the arm64 tree for 5.4? Unfortunately, it doesn't apply because the tree you've based it on has removed ioremap_wt(). If you send a version based on mainline, I can queue it. Cheers, Will
diff --git a/arch/arm64/include/asm/io.h b/arch/arm64/include/asm/io.h index a61b1469f7d9..1bf5631671c3 100644 --- a/arch/arm64/include/asm/io.h +++ b/arch/arm64/include/asm/io.h @@ -165,12 +165,11 @@ extern void __memset_io(volatile void __iomem *, int, size_t); * I/O memory mapping functions. */ extern void __iomem *__ioremap(phys_addr_t phys_addr, size_t size, pgprot_t prot); -extern void __iounmap(volatile void __iomem *addr); +extern void iounmap(volatile void __iomem *addr); extern void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size); #define ioremap(addr, size) __ioremap((addr), (size), __pgprot(PROT_DEVICE_nGnRE)) #define ioremap_wc(addr, size) __ioremap((addr), (size), __pgprot(PROT_NORMAL_NC)) -#define iounmap __iounmap /* * PCI configuration space mapping function. diff --git a/arch/arm64/mm/ioremap.c b/arch/arm64/mm/ioremap.c index fdb595a5d65f..9be71bee902c 100644 --- a/arch/arm64/mm/ioremap.c +++ b/arch/arm64/mm/ioremap.c @@ -69,7 +69,7 @@ void __iomem *__ioremap(phys_addr_t phys_addr, size_t size, pgprot_t prot) } EXPORT_SYMBOL(__ioremap); -void __iounmap(volatile void __iomem *io_addr) +void iounmap(volatile void __iomem *io_addr) { unsigned long addr = (unsigned long)io_addr & PAGE_MASK; @@ -80,7 +80,7 @@ void __iounmap(volatile void __iomem *io_addr) if (is_vmalloc_addr((void *)addr)) vunmap((void *)addr); } -EXPORT_SYMBOL(__iounmap); +EXPORT_SYMBOL(iounmap); void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size) {
No need to indirect iounmap for arm64. Signed-off-by: Christoph Hellwig <hch@lst.de> --- arch/arm64/include/asm/io.h | 3 +-- arch/arm64/mm/ioremap.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-)