diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-15 09:30:39 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-15 09:30:39 +0900 |
| commit | cbbe2f68f678a90bebeb30b8a7fcd8aed0614879 (patch) | |
| tree | 4a8ffeea96f32ff6e532fdc2667181b48d5a26ca | |
| parent | 2739742c24f1a55365e71f0722bfdce8994e9c4e (diff) | |
| download | linux-stable-cbbe2f68f678a90bebeb30b8a7fcd8aed0614879.tar.gz linux-stable-cbbe2f68f678a90bebeb30b8a7fcd8aed0614879.tar.bz2 linux-stable-cbbe2f68f678a90bebeb30b8a7fcd8aed0614879.zip | |
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: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | arch/sh/include/asm/cacheflush.h | 2 | ||||
| -rw-r--r-- | arch/sh/mm/Makefile_32 | 16 | ||||
| -rw-r--r-- | arch/sh/mm/cache.c (renamed from arch/sh/mm/pg-mmu.c) | 0 |
3 files changed, 8 insertions, 10 deletions
diff --git a/arch/sh/include/asm/cacheflush.h b/arch/sh/include/asm/cacheflush.h index 0e87e87cc01f..4bf621e4146d 100644 --- a/arch/sh/include/asm/cacheflush.h +++ b/arch/sh/include/asm/cacheflush.h @@ -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) diff --git a/arch/sh/mm/Makefile_32 b/arch/sh/mm/Makefile_32 index 30771b137f48..affcc9a15cea 100644 --- a/arch/sh/mm/Makefile_32 +++ b/arch/sh/mm/Makefile_32 @@ -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 diff --git a/arch/sh/mm/pg-mmu.c b/arch/sh/mm/cache.c index f51d0a4eb3ba..f51d0a4eb3ba 100644 --- a/arch/sh/mm/pg-mmu.c +++ b/arch/sh/mm/cache.c |