diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2011-03-28 22:32:05 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2011-05-24 10:03:50 +1000 |
| commit | 593732bd41a6f16eeed9880ae7d51920fc5350ff (patch) | |
| tree | 9ee9bf84b02f103594eefcb819096856bf64cc6f | |
| parent | 92474a2513e828c27e371728845f24cef98748b2 (diff) | |
| download | linux-3.10-593732bd41a6f16eeed9880ae7d51920fc5350ff.tar.gz linux-3.10-593732bd41a6f16eeed9880ae7d51920fc5350ff.tar.bz2 linux-3.10-593732bd41a6f16eeed9880ae7d51920fc5350ff.zip | |
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: Greg Ungerer <gerg@uclinux.org>
| -rw-r--r-- | arch/m68k/include/asm/io_no.h | 8 | ||||
| -rw-r--r-- | arch/m68k/kernel/m68k_ksyms_no.c | 2 | ||||
| -rw-r--r-- | arch/m68k/mm/Makefile_no | 2 | ||||
| -rw-r--r-- | arch/m68k/mm/kmap_no.c | 37 |
4 files changed, 6 insertions, 43 deletions
diff --git a/arch/m68k/include/asm/io_no.h b/arch/m68k/include/asm/io_no.h index cf20f3097af..353bf754a97 100644 --- a/arch/m68k/include/asm/io_no.h +++ b/arch/m68k/include/asm/io_no.h @@ -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 diff --git a/arch/m68k/kernel/m68k_ksyms_no.c b/arch/m68k/kernel/m68k_ksyms_no.c index 10af0af4dde..c26717bcf30 100644 --- a/arch/m68k/kernel/m68k_ksyms_no.c +++ b/arch/m68k/kernel/m68k_ksyms_no.c @@ -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); diff --git a/arch/m68k/mm/Makefile_no b/arch/m68k/mm/Makefile_no index b54ab6b4b52..80579c6a688 100644 --- a/arch/m68k/mm/Makefile_no +++ b/arch/m68k/mm/Makefile_no @@ -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 diff --git a/arch/m68k/mm/kmap_no.c b/arch/m68k/mm/kmap_no.c deleted file mode 100644 index 38b2abe9d9a..00000000000 --- a/arch/m68k/mm/kmap_no.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * 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) -{ -} - |