From 7ae64473b8c92f85ea79a8aa9bb465cdc1f64bae Mon Sep 17 00:00:00 2001 From: David Daney Date: Fri, 14 May 2010 12:44:18 -0700 Subject: [PATCH] --- yaml --- r: 196796 b: refs/heads/master c: 0453fb3c528c5eb3483441a466b24a4cb409eec5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/include/asm/processor.h | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 4e806892ce0b..87c38a729b0d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 606c958e2857d29106b8d3b2fc30e22f376c80c5 +refs/heads/master: 0453fb3c528c5eb3483441a466b24a4cb409eec5 diff --git a/trunk/arch/mips/include/asm/processor.h b/trunk/arch/mips/include/asm/processor.h index ab387910009a..5d33b727acf5 100644 --- a/trunk/arch/mips/include/asm/processor.h +++ b/trunk/arch/mips/include/asm/processor.h @@ -344,16 +344,10 @@ unsigned long get_wchan(struct task_struct *p); #ifdef CONFIG_CPU_HAS_PREFETCH #define ARCH_HAS_PREFETCH +#define prefetch(x) __builtin_prefetch((x), 0, 1) -static inline void prefetch(const void *addr) -{ - __asm__ __volatile__( - " .set mips4 \n" - " pref %0, (%1) \n" - " .set mips0 \n" - : - : "i" (Pref_Load), "r" (addr)); -} +#define ARCH_HAS_PREFETCHW +#define prefetchw(x) __builtin_prefetch((x), 1, 1) #endif