Commit 07686347 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

m68k: rename __iounmap and mark it static 



m68k uses __iounmap as the name for an internal helper that is only
used for some CPU types.  Mark it static, give it a better name
and move it around a bit to avoid a forward declaration.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent d092a870

arch/m68k/include/asm/kmap.h

+0 −1
Original line number Diff line number Diff line
@@ -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)

arch/m68k/mm/kmap.c

+50 −50
Original line number Diff line number Diff line
@@ -54,6 +54,55 @@ static inline void free_io_area(void *addr) 


static struct vm_struct *iolist;



/*

 * __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.

 */

static void __free_io_area(void *addr, unsigned long size)

{

	unsigned long virtaddr = (unsigned long)addr;

	pgd_t *pgd_dir;

	pmd_t *pmd_dir;

	pte_t *pte_dir;



	while ((long)size > 0) {

		pgd_dir = pgd_offset_k(virtaddr);

		if (pgd_bad(*pgd_dir)) {

			printk("iounmap: bad pgd(%08lx)\n", pgd_val(*pgd_dir));

			pgd_clear(pgd_dir);

			return;

		}

		pmd_dir = pmd_offset(pgd_dir, virtaddr);



		if (CPU_IS_020_OR_030) {

			int pmd_off = (virtaddr/PTRTREESIZE) & 15;

			int pmd_type = pmd_dir->pmd[pmd_off] & _DESCTYPE_MASK;



			if (pmd_type == _PAGE_PRESENT) {

				pmd_dir->pmd[pmd_off] = 0;

				virtaddr += PTRTREESIZE;

				size -= PTRTREESIZE;

				continue;

			} else if (pmd_type == 0)

				continue;

		}



		if (pmd_bad(*pmd_dir)) {

			printk("iounmap: bad pmd (%08lx)\n", pmd_val(*pmd_dir));

			pmd_clear(pmd_dir);

			return;

		}

		pte_dir = pte_offset_kernel(pmd_dir, virtaddr);



		pte_val(*pte_dir) = 0;

		virtaddr += PAGE_SIZE;

		size -= PAGE_SIZE;

	}



	flush_tlb_all();

}



static struct vm_struct *get_io_area(unsigned long size)

{

	unsigned long addr;
@@ -90,7 +139,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,55 +298,6 @@ void iounmap(void __iomem *addr) 
}

EXPORT_SYMBOL(iounmap);



/*

 * __iounmap 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)

{

	unsigned long virtaddr = (unsigned long)addr;

	pgd_t *pgd_dir;

	pmd_t *pmd_dir;

	pte_t *pte_dir;



	while ((long)size > 0) {

		pgd_dir = pgd_offset_k(virtaddr);

		if (pgd_bad(*pgd_dir)) {

			printk("iounmap: bad pgd(%08lx)\n", pgd_val(*pgd_dir));

			pgd_clear(pgd_dir);

			return;

		}

		pmd_dir = pmd_offset(pgd_dir, virtaddr);



		if (CPU_IS_020_OR_030) {

			int pmd_off = (virtaddr/PTRTREESIZE) & 15;

			int pmd_type = pmd_dir->pmd[pmd_off] & _DESCTYPE_MASK;



			if (pmd_type == _PAGE_PRESENT) {

				pmd_dir->pmd[pmd_off] = 0;

				virtaddr += PTRTREESIZE;

				size -= PTRTREESIZE;

				continue;

			} else if (pmd_type == 0)

				continue;

		}



		if (pmd_bad(*pmd_dir)) {

			printk("iounmap: bad pmd (%08lx)\n", pmd_val(*pmd_dir));

			pmd_clear(pmd_dir);

			return;

		}

		pte_dir = pte_offset_kernel(pmd_dir, virtaddr);



		pte_val(*pte_dir) = 0;

		virtaddr += PAGE_SIZE;

		size -= PAGE_SIZE;

	}



	flush_tlb_all();

}



/*

 * Set new cache mode for some kernel address space.

 * The caller must push data for that range itself, if such data may already

CRA Git | Maintained and supported by SUSTech CRA and CCSE