sh: Kill off unused flush_icache_user_range().

We use flush_cache_page() outright in copy_to_user_page(), and nothing
else needs it, so just kill it off. SH-5 still defines its own version,
but that too will go away in the same fashion once it converts over.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/include/asm/cacheflush.h b/arch/sh/include/asm/cacheflush.h
index 52488eb6b7398214fd212ae010b6f1ff17040872..b1cf30f423af2915a3857f816889c2cbb8593a8e 100644 (file)
--- a/arch/sh/include/asm/cacheflush.h
+++ b/arch/sh/include/asm/cacheflush.h
@@ -21,7 +21,6 @@
 #define flush_icache_range(start, end)         do { } while (0)
 #define flush_icache_page(vma,pg)              do { } while (0)
 #define flush_cache_sigtramp(vaddr)            do { } while (0)
-#define flush_icache_user_range(vma,pg,adr,len)        do { } while (0)
 #define __flush_wback_region(start, size)      do { (void)(start); } while (0)
 #define __flush_purge_region(start, size)      do { (void)(start); } while (0)
 #define __flush_invalidate_region(start, size) do { (void)(start); } while (0)

diff --git a/arch/sh/include/cpu-common/cpu/cacheflush.h b/arch/sh/include/cpu-common/cpu/cacheflush.h
index b8c0a0a0c827df318e1551b1f2d1c800e47d1059..5dc3736218e70713845d816f7b6580ea86040810 100644 (file)
--- a/arch/sh/include/cpu-common/cpu/cacheflush.h
+++ b/arch/sh/include/cpu-common/cpu/cacheflush.h
@@ -34,7 +34,6 @@
 #define flush_dcache_page(page)                        do { } while (0)
 #define flush_icache_range(start, end)         do { } while (0)
 #define flush_icache_page(vma,pg)              do { } while (0)
-#define flush_icache_user_range(vma,pg,adr,len)        do { } while (0)
 #define flush_cache_sigtramp(vaddr)            do { } while (0)
 
 #endif /* __ASM_CPU_SH2_CACHEFLUSH_H */

diff --git a/arch/sh/include/cpu-sh2a/cpu/cacheflush.h b/arch/sh/include/cpu-sh2a/cpu/cacheflush.h
index e9ecb6d3dd344eff02160c9d9ad54aa7bc15eaaa..32a529187a38de78001d49a30658980e8f93fa36 100644 (file)
--- a/arch/sh/include/cpu-sh2a/cpu/cacheflush.h
+++ b/arch/sh/include/cpu-sh2a/cpu/cacheflush.h
@@ -25,7 +25,6 @@
 #define flush_dcache_page(page)                        do { } while (0)
 void flush_icache_range(unsigned long start, unsigned long end);
 #define flush_icache_page(vma,pg)              do { } while (0)
-#define flush_icache_user_range(vma,pg,adr,len)        do { } while (0)
 #define flush_cache_sigtramp(vaddr)            do { } while (0)
 
 #endif /* __ASM_CPU_SH2A_CACHEFLUSH_H */

diff --git a/arch/sh/include/cpu-sh3/cpu/cacheflush.h b/arch/sh/include/cpu-sh3/cpu/cacheflush.h
index 98c7a73245515dde19991618a99551c6a4e9714e..0f5cf5460d05342d21838e0c02046f616c7efdba 100644 (file)
--- a/arch/sh/include/cpu-sh3/cpu/cacheflush.h
+++ b/arch/sh/include/cpu-sh3/cpu/cacheflush.h
@@ -27,7 +27,6 @@ void flush_icache_page(struct vm_area_struct *vma, struct page *page);
 
 /* SH3 has unified cache so no special action needed here */
 #define flush_cache_sigtramp(vaddr)            do { } while (0)
-#define flush_icache_user_range(vma,pg,adr,len)        do { } while (0)
 
 #else
 #include <cpu-common/cpu/cacheflush.h>

diff --git a/arch/sh/include/cpu-sh4/cpu/cacheflush.h b/arch/sh/include/cpu-sh4/cpu/cacheflush.h
index 67d9bc98a589d87be10a846d26219a2698d9ab23..d6bd396d7dfbc65ede854fbf515d5e8ef0599fe7 100644 (file)
--- a/arch/sh/include/cpu-sh4/cpu/cacheflush.h
+++ b/arch/sh/include/cpu-sh4/cpu/cacheflush.h
@@ -25,8 +25,6 @@ void flush_cache_page(struct vm_area_struct *vma, unsigned long addr,
                      unsigned long pfn);
 void flush_dcache_page(struct page *pg);
 void flush_icache_range(unsigned long start, unsigned long end);
-void flush_icache_user_range(struct vm_area_struct *vma, struct page *page,
-                            unsigned long addr, int len);
 
 #define flush_icache_page(vma,pg)              do { } while (0)
 

diff --git a/arch/sh/include/cpu-sh5/cpu/cacheflush.h b/arch/sh/include/cpu-sh5/cpu/cacheflush.h
index e9c26bdf314253cbbbbadd6864c073be10cfbb80..740d10a316ef16e8907f6a1128c8bc242db88afc 100644 (file)
--- a/arch/sh/include/cpu-sh5/cpu/cacheflush.h
+++ b/arch/sh/include/cpu-sh5/cpu/cacheflush.h
@@ -15,9 +15,6 @@ extern void flush_cache_range(struct vm_area_struct *vma, unsigned long start,
 extern void flush_cache_page(struct vm_area_struct *vma, unsigned long addr, unsigned long pfn);
 extern void flush_dcache_page(struct page *pg);
 extern void flush_icache_range(unsigned long start, unsigned long end);
-extern void flush_icache_user_range(struct vm_area_struct *vma,
-                                   struct page *page, unsigned long addr,
-                                   int len);
 
 #define flush_cache_dup_mm(mm) flush_cache_mm(mm)
 #define flush_icache_page(vma, page)   do { } while (0)

diff --git a/arch/sh/mm/cache-sh4.c b/arch/sh/mm/cache-sh4.c
index 4466787a52aa0a4682bb007c20c8f4083b3cbd0b..b5860535e61f9ad6bd7bcc878ff599401809c0e6 100644 (file)
--- a/arch/sh/mm/cache-sh4.c
+++ b/arch/sh/mm/cache-sh4.c
@@ -401,20 +401,6 @@ void flush_cache_range(struct vm_area_struct *vma, unsigned long start,
        }
 }
 
-/*
- * flush_icache_user_range
- * @vma: VMA of the process
- * @page: page
- * @addr: U0 address
- * @len: length of the range (< page size)
- */
-void flush_icache_user_range(struct vm_area_struct *vma,
-                            struct page *page, unsigned long addr, int len)
-{
-       flush_cache_page(vma, addr, page_to_pfn(page));
-       mb();
-}
-
 /**
  * __flush_cache_4096
  *

diff --git a/arch/sh/mm/cache-sh5.c b/arch/sh/mm/cache-sh5.c
index 576cad04b11b79016f1bf4a534b194eec68a4b3a..a50d23caf015e01831987bad083f51eda1f57807 100644 (file)
--- a/arch/sh/mm/cache-sh5.c
+++ b/arch/sh/mm/cache-sh5.c
@@ -655,7 +655,7 @@ void flush_icache_range(unsigned long start, unsigned long end)
  * range following a poke into the program text through the ptrace() call
  * from another process (e.g. for BRK instruction insertion).
  */
-void flush_icache_user_range(struct vm_area_struct *vma,
+static void flush_icache_user_range(struct vm_area_struct *vma,
                        struct page *page, unsigned long addr, int len)
 {