From f2ba248dfa2c4df09ac5d37365dfb5f06631362e Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Sun, 16 Aug 2009 02:15:50 +0900 Subject: [PATCH] --- yaml --- r: 163431 b: refs/heads/master c: 8c41cdcaffb09dca8e6ad7d4d8f885e0b86b9002 h: refs/heads/master i: 163429: 1b778bf16139311823396842583fcc2ae164d5a5 163427: 0e4f508a4544de9953b1aaa004c5b6455ec0b796 163423: 5f2c9dfa33038971c6c557994f87a854be57aa5a v: v3 --- [refs] | 2 +- trunk/arch/sh/mm/cache-sh5.c | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/[refs] b/[refs] index fb903bf841aa..fec0d56e30cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94ecd224c940830e2f2724c3860eb7fb74c15d31 +refs/heads/master: 8c41cdcaffb09dca8e6ad7d4d8f885e0b86b9002 diff --git a/trunk/arch/sh/mm/cache-sh5.c b/trunk/arch/sh/mm/cache-sh5.c index 819e0f9e8dba..d4a445c865d7 100644 --- a/trunk/arch/sh/mm/cache-sh5.c +++ b/trunk/arch/sh/mm/cache-sh5.c @@ -25,14 +25,6 @@ extern void __weak sh4__flush_region_init(void); /* Wired TLB entry for the D-cache */ static unsigned long long dtlb_cache_slot; -#ifdef CONFIG_DCACHE_DISABLED -#define sh64_dcache_purge_all() do { } while (0) -#define sh64_dcache_purge_coloured_phy_page(paddr, eaddr) do { } while (0) -#define sh64_dcache_purge_user_range(mm, start, end) do { } while (0) -#define sh64_dcache_purge_phy_page(paddr) do { } while (0) -#define sh64_dcache_purge_virt_page(mm, eaddr) do { } while (0) -#endif - /* * The following group of functions deal with mapping and unmapping a * temporary page into a DTLB slot that has been set aside for exclusive @@ -52,7 +44,6 @@ static inline void sh64_teardown_dtlb_cache_slot(void) local_irq_enable(); } -#ifndef CONFIG_ICACHE_DISABLED static inline void sh64_icache_inv_all(void) { unsigned long long addr, flag, data; @@ -237,9 +228,7 @@ static void sh64_icache_inv_current_user_range(unsigned long start, unsigned lon addr += L1_CACHE_BYTES; } } -#endif /* !CONFIG_ICACHE_DISABLED */ -#ifndef CONFIG_DCACHE_DISABLED /* Buffer used as the target of alloco instructions to purge data from cache sets by natural eviction. -- RPC */ #define DUMMY_ALLOCO_AREA_SIZE ((L1_CACHE_BYTES << 10) + (1024 * 4)) @@ -489,7 +478,6 @@ static void sh64_dcache_purge_user_range(struct mm_struct *mm, sh64_dcache_purge_user_pages(mm, start, end); } } -#endif /* !CONFIG_DCACHE_DISABLED */ /* * Invalidate the entire contents of both caches, after writing back to