Skip to content

Commit

Permalink
sh: Split out ioremap in to _32 and _64 variants.
Browse files Browse the repository at this point in the history
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Paul Mundt committed Jan 28, 2008
1 parent 4b7be4f commit ad81eb9
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion arch/sh/mm/Makefile_32
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
5 changes: 5 additions & 0 deletions arch/sh/mm/Makefile_64
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
13 changes: 6 additions & 7 deletions arch/sh64/mm/ioremap.c → arch/sh/mm/ioremap_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit ad81eb9

Please sign in to comment.