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

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

sh: rename pg-mmu.c -> cache.c, enable generically. 



This builds in the newly created cache.c (renamed from pg-mmu.c) for both
MMU and NOMMU configurations. The kmap_coherent() stubs and alias
information recorded by each CPU family takes care of doing the right
thing while enabling the code to be commonly shared.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 2739742c

arch/sh/include/asm/cacheflush.h

+0 −2
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ extern void __flush_purge_region(void *start, int size); 
extern void __flush_invalidate_region(void *start, int size);

#endif



#ifdef CONFIG_MMU

#define ARCH_HAS_FLUSH_ANON_PAGE

extern void __flush_anon_page(struct page *page, unsigned long);
@@ -55,7 +54,6 @@ static inline void flush_anon_page(struct vm_area_struct *vma, 
	if (boot_cpu_data.dcache.n_aliases && PageAnon(page))

		__flush_anon_page(page, vmaddr);

}

#endif



#define ARCH_HAS_FLUSH_KERNEL_DCACHE_PAGE

static inline void flush_kernel_dcache_page(struct page *page)

arch/sh/mm/Makefile_32

+8 −8
Original line number Diff line number Diff line
@@ -2,20 +2,20 @@ 
# Makefile for the Linux SuperH-specific parts of the memory manager.

#



obj-y			:= init.o extable_32.o consistent.o mmap.o

obj-y			:= cache.o init.o extable_32.o consistent.o mmap.o



ifndef CONFIG_CACHE_OFF

cache-$(CONFIG_CPU_SH2)		:= cache-sh2.o

cache-$(CONFIG_CPU_SH2A)	:= cache-sh2a.o

cache-$(CONFIG_CPU_SH3)		:= cache-sh3.o

cache-$(CONFIG_CPU_SH4)		:= cache-sh4.o flush-sh4.o

cache-$(CONFIG_SH7705_CACHE_32KB)	+= cache-sh7705.o

cacheops-$(CONFIG_CPU_SH2)		:= cache-sh2.o

cacheops-$(CONFIG_CPU_SH2A)		:= cache-sh2a.o

cacheops-$(CONFIG_CPU_SH3)		:= cache-sh3.o

cacheops-$(CONFIG_CPU_SH4)		:= cache-sh4.o flush-sh4.o

cacheops-$(CONFIG_SH7705_CACHE_32KB)	+= cache-sh7705.o

endif



obj-y			+= $(cache-y)

obj-y			+= $(cacheops-y)



mmu-y			:= tlb-nommu.o pg-nommu.o

mmu-$(CONFIG_MMU)	:= fault_32.o kmap.o tlbflush_32.o ioremap_32.o pg-mmu.o

mmu-$(CONFIG_MMU)	:= fault_32.o kmap.o tlbflush_32.o ioremap_32.o



obj-y			+= $(mmu-y)

obj-$(CONFIG_DEBUG_FS)	+= asids-debugfs.o

arch/sh/mm/pg-mmu.c→arch/sh/mm/cache.c

+0 −0

File moved.

View file