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

Commit ad81eb91 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Split out ioremap in to _32 and _64 variants.



Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 4b7be4f2
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ endif

mmu-y			:= tlb-nommu.o pg-nommu.o
mmu-$(CONFIG_MMU)	:= fault.o clear_page.o copy_page.o tlb-flush.o	\
			   ioremap.o
			   ioremap_32.o

obj-y			+= $(mmu-y)

+5 −0
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@

obj-y			:= init.o extable_64.o consistent.o

mmu-y			:= tlb-nommu.o pg-nommu.o
mmu-$(CONFIG_MMU)	:= ioremap_64.o

obj-y			+= $(mmu-y)

obj-$(CONFIG_HUGETLB_PAGE)	+= hugetlbpage.o
obj-$(CONFIG_PMB)		+= pmb.o
obj-$(CONFIG_NUMA)		+= numa.o
+0 −0

File moved.

+6 −7
Original line number Diff line number Diff line
@@ -13,18 +13,17 @@
 *
 *   (C) Copyright 1995 1996 Linus Torvalds
 */
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/sched.h>
#include <linux/string.h>
#include <linux/io.h>
#include <linux/ioport.h>
#include <linux/bootmem.h>
#include <linux/proc_fs.h>
#include <linux/module.h>
#include <linux/mm.h>
#include <linux/io.h>
#include <asm/page.h>
#include <asm/pgalloc.h>
#include <asm/addrspace.h>
#include <asm/cacheflush.h>
#include <asm/tlbflush.h>
#include <asm/mmu.h>

static void shmedia_mapioaddr(unsigned long, unsigned long);
static unsigned long shmedia_ioremap(struct resource *, u32, int);