[PATCH 18/26] m68k: rename __iounmap and mark it static

Christoph Hellwig
2019-08-17T07:32:45Z

m68k uses __iounmap as the name for an internal helper that is only
used for some CPU types. Mark it static and give it a better name.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/m68k/include/asm/kmap.h | 1 -
arch/m68k/mm/kmap.c | 9 ++++++---
2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/arch/m68k/include/asm/kmap.h b/arch/m68k/include/asm/kmap.h
index 421b6c9c769d..559cb91bede1 100644
--- a/arch/m68k/include/asm/kmap.h
+++ b/arch/m68k/include/asm/kmap.h
@@ -20,7 +20,6 @@ extern void __iomem *__ioremap(unsigned long physaddr, unsigned long size,
int cacheflag);
#define iounmap iounmap
extern void iounmap(void __iomem *addr);
-extern void __iounmap(void *addr, unsigned long size);

#define ioremap ioremap
static inline void __iomem *ioremap(unsigned long physaddr, unsigned long size)
diff --git a/arch/m68k/mm/kmap.c b/arch/m68k/mm/kmap.c
index 40a3b327da07..4c279cf0bcc8 100644
--- a/arch/m68k/mm/kmap.c
+++ b/arch/m68k/mm/kmap.c
@@ -52,6 +52,7 @@ static inline void free_io_area(void *addr)

#define IO_SIZE (256*1024)

+static void __free_io_area(void *addr, unsigned long size);
static struct vm_struct *iolist;

static struct vm_struct *get_io_area(unsigned long size)
@@ -90,7 +91,7 @@ static inline void free_io_area(void *addr)
if (tmp->addr = addr) {
*p = tmp->next;
/* remove gap added in get_io_area() */
- __iounmap(tmp->addr, tmp->size - IO_SIZE);
+ __free_io_area(tmp->addr, tmp->size - IO_SIZE);
kfree(tmp);
return;
}
@@ -249,12 +250,13 @@ void iounmap(void __iomem *addr)
}
EXPORT_SYMBOL(iounmap);

+#ifndef CPU_M68040_OR_M68060_ONLY
/*
- * __iounmap unmaps nearly everything, so be careful
+ * __free_io_area unmaps nearly everything, so be careful
* Currently it doesn't free pointer/page tables anymore but this
* wasn't used anyway and might be added later.
*/
-void __iounmap(void *addr, unsigned long size)
+static void __free_io_area(void *addr, unsigned long size)
{
unsigned long virtaddr = (unsigned long)addr;
pgd_t *pgd_dir;
@@ -297,6 +299,7 @@ void __iounmap(void *addr, unsigned long size)

flush_tlb_all();
}
+#endif /* CPU_M68040_OR_M68060_ONLY */

/*
* Set new cache mode for some kernel address space.
--
2.20.1