Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 593732bd41a6f16eeed9880ae7d51920fc5350ff

Authored by Greg Ungerer
1 parent 92474a2513
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 4 changed files with 6 additions and 43 deletions Side-by-side Diff

arch/m68k/include/asm/io_no.h
Diff comments   View file @ 593732b
... ... @@ -144,8 +144,10 @@
144 144 #define IOMAP_NOCACHE_NONSER 2
145 145 #define IOMAP_WRITETHROUGH 3
146 146  
147   -extern void *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag);
148   -
  147 +static inline void *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag)
  148 +{
  149 + return (void *) physaddr;
  150 +}
149 151 static inline void *ioremap(unsigned long physaddr, unsigned long size)
150 152 {
151 153 return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);
... ... @@ -163,7 +165,7 @@
163 165 return __ioremap(physaddr, size, IOMAP_FULL_CACHING);
164 166 }
165 167  
166   -extern void iounmap(void *addr);
  168 +#define iounmap(addr) do { } while(0)
167 169  
168 170 /*
169 171 * Convert a physical pointer to a virtual kernel pointer for /dev/mem
arch/m68k/kernel/m68k_ksyms_no.c
Diff comments   View file @ 593732b
... ... @@ -20,8 +20,6 @@
20 20  
21 21 /* platform dependent support */
22 22  
23   -EXPORT_SYMBOL(__ioremap);
24   -EXPORT_SYMBOL(iounmap);
25 23 EXPORT_SYMBOL(dump_fpu);
26 24  
27 25 EXPORT_SYMBOL(ip_fast_csum);
arch/m68k/mm/Makefile_no
Diff comments   View file @ 593732b
... ... @@ -2,5 +2,5 @@
2 2 # Makefile for the linux m68knommu specific parts of the memory manager.
3 3 #
4 4  
5   -obj-y += init.o kmap.o
  5 +obj-y += init.o
arch/m68k/mm/kmap_no.c
View file @ 593732b
1   -/*
2   - * linux/arch/m68knommu/mm/kmap.c
3   - *
4   - * Copyright (C) 2000 Lineo, <davidm@snapgear.com>
5   - * Copyright (C) 2000-2002 David McCullough <davidm@snapgear.com>
6   - */
7   -
8   -#include <linux/mm.h>
9   -#include <linux/kernel.h>
10   -#include <linux/string.h>
11   -#include <linux/types.h>
12   -#include <linux/vmalloc.h>
13   -
14   -#include <asm/setup.h>
15   -#include <asm/segment.h>
16   -#include <asm/page.h>
17   -#include <asm/pgalloc.h>
18   -#include <asm/io.h>
19   -#include <asm/system.h>
20   -
21   -#undef DEBUG
22   -
23   -/*
24   - * Map some physical address range into the kernel address space.
25   - */
26   -void *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag)
27   -{
28   - return (void *)physaddr;
29   -}
30   -
31   -/*
32   - * Unmap a ioremap()ed region again.
33   - */
34   -void iounmap(void *addr)
35   -{
36   -}