3 files changed, 7 insertions, 26 deletions

diff --git a/arch/parisc/include/asm/cacheflush.h b/arch/parisc/include/asm/cacheflush.h
index 7bd69bd43a01..19c9c3c5f267 100644
--- a/arch/parisc/include/asm/cacheflush.h
+++ b/arch/parisc/include/asm/cacheflush.h
@@ -27,8 +27,6 @@ void flush_user_dcache_range_asm(unsigned long, unsigned long);
 void flush_kernel_dcache_range_asm(unsigned long, unsigned long);
 void flush_kernel_dcache_page_asm(void *);
 void flush_kernel_icache_page(void *);
-void flush_user_dcache_range(unsigned long, unsigned long);
-void flush_user_icache_range(unsigned long, unsigned long);
 
 /* Cache flush operations */
 
diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c
index 977f0a4f5ecf..20b013cbd297 100644
--- a/arch/parisc/kernel/cache.c
+++ b/arch/parisc/kernel/cache.c
@@ -573,24 +573,6 @@ void flush_cache_mm(struct mm_struct *mm)
         }
 }
 
-void
-flush_user_dcache_range(unsigned long start, unsigned long end)
-{
-        if ((end - start) < parisc_cache_flush_threshold)
-                flush_user_dcache_range_asm(start,end);
-        else
-                flush_data_cache();
-}
-
-void
-flush_user_icache_range(unsigned long start, unsigned long end)
-{
-        if ((end - start) < parisc_cache_flush_threshold)
-                flush_user_icache_range_asm(start,end);
-        else
-                flush_instruction_cache();
-}
-
 void flush_cache_range(struct vm_area_struct *vma,
                 unsigned long start, unsigned long end)
 {
diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c
index e58925ac64d1..f6aaca27ac4e 100644
--- a/arch/parisc/kernel/signal.c
+++ b/arch/parisc/kernel/signal.c
@@ -232,6 +232,7 @@ setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs,
         struct rt_sigframe __user *frame;
         unsigned long rp, usp;
         unsigned long haddr, sigframe_size;
+        unsigned long start, end;
         int err = 0;
 #ifdef CONFIG_64BIT
         struct compat_rt_sigframe __user * compat_frame;
@@ -299,10 +300,10 @@ setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs,
         }
 #endif
 
-        flush_user_dcache_range((unsigned long) &frame->tramp[0],
-                           (unsigned long) &frame->tramp[TRAMP_SIZE]);
-        flush_user_icache_range((unsigned long) &frame->tramp[0],
-                           (unsigned long) &frame->tramp[TRAMP_SIZE]);
+        start = (unsigned long) &frame->tramp[0];
+        end = (unsigned long) &frame->tramp[TRAMP_SIZE];
+        flush_user_dcache_range_asm(start, end);
+        flush_user_icache_range_asm(start, end);
 
         /* TRAMP Words 0-4, Length 5 = SIGRESTARTBLOCK_TRAMP
          * TRAMP Words 5-9, Length 4 = SIGRETURN_TRAMP
@@ -548,8 +549,8 @@ insert_restart_trampoline(struct pt_regs *regs)
                 WARN_ON(err);
 
                 /* flush data/instruction cache for new insns */
-                flush_user_dcache_range(start, end);
-                flush_user_icache_range(start, end);
+                flush_user_dcache_range_asm(start, end);
+                flush_user_icache_range_asm(start, end);
 
                 regs->gr[31] = regs->gr[30] + 8;
                 return;