Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 593732bd authored by Greg Ungerer's avatar Greg Ungerer
Browse files

m68knommu: remove stubs for __ioremap() and iounmap() 



The implementation of iounmap() and __ioremap() for non-mmu m68k is
trivial. We can inline them in m68knommu headers and remove the trivial
implementations.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
parent 92474a25

arch/m68k/include/asm/io_no.h

+5 −3
Original line number Diff line number Diff line
@@ -144,8 +144,10 @@ static inline void io_insl(unsigned int addr, void *buf, int len) 
#define IOMAP_NOCACHE_NONSER		2

#define IOMAP_WRITETHROUGH		3



extern void *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag);



static inline void *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag)

{

	return (void *) physaddr;

}

static inline void *ioremap(unsigned long physaddr, unsigned long size)

{

	return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);
@@ -163,7 +165,7 @@ static inline void *ioremap_fullcache(unsigned long physaddr, unsigned long size 
	return __ioremap(physaddr, size, IOMAP_FULL_CACHING);

}



extern void iounmap(void *addr);

#define	iounmap(addr)	do { } while(0)



/*

 * Convert a physical pointer to a virtual kernel pointer for /dev/mem

arch/m68k/kernel/m68k_ksyms_no.c

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ extern int dump_fpu(struct pt_regs *, elf_fpregset_t *); 


/* platform dependent support */



EXPORT_SYMBOL(__ioremap);

EXPORT_SYMBOL(iounmap);

EXPORT_SYMBOL(dump_fpu);



EXPORT_SYMBOL(ip_fast_csum);

arch/m68k/mm/Makefile_no

+1 −1
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@ 
# Makefile for the linux m68knommu specific parts of the memory manager.

#



obj-y += init.o kmap.o
 
obj-y += init.o

arch/m68k/mm/kmap_no.c

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
/*

 *  linux/arch/m68knommu/mm/kmap.c

 *

 *  Copyright (C) 2000 Lineo, <davidm@snapgear.com>

 *  Copyright (C) 2000-2002 David McCullough <davidm@snapgear.com>

 */



#include <linux/mm.h>

#include <linux/kernel.h>

#include <linux/string.h>

#include <linux/types.h>

#include <linux/vmalloc.h>



#include <asm/setup.h>

#include <asm/segment.h>

#include <asm/page.h>

#include <asm/pgalloc.h>

#include <asm/io.h>

#include <asm/system.h>



#undef DEBUG



/*

 * Map some physical address range into the kernel address space.

 */

void *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag)

{

	return (void *)physaddr;

}



/*

 * Unmap a ioremap()ed region again.

 */

void iounmap(void *addr)

{

}