summaryrefslogtreecommitdiffstats
path: root/arch/sh/include/asm
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-11-30 14:55:11 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-11-30 14:55:11 +0900
commit7d0dbea312a6508389241b4fb6cda1c4d1e32d6e (patch)
treef23b591e8c6f921c91fce00a6453d4087ec3c071 /arch/sh/include/asm
parent5c4986b8a9ddd9cf649abe38a102866f7809b1d2 (diff)
parent193006f7e3b1abd42d7a3677b54fa2996461a842 (diff)
Merge branch 'sh/urgent' into sh-latest
Diffstat (limited to 'arch/sh/include/asm')
-rw-r--r--arch/sh/include/asm/processor_32.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/sh/include/asm/processor_32.h b/arch/sh/include/asm/processor_32.h
index 46d5179c9f4..e3c73cdd8c9 100644
--- a/arch/sh/include/asm/processor_32.h
+++ b/arch/sh/include/asm/processor_32.h
@@ -199,10 +199,13 @@ extern unsigned long get_wchan(struct task_struct *p);
#define ARCH_HAS_PREFETCHW
static inline void prefetch(void *x)
{
- __asm__ __volatile__ ("pref @%0\n\t" : : "r" (x) : "memory");
+ __builtin_prefetch(x, 0, 3);
}
-#define prefetchw(x) prefetch(x)
+static inline void prefetchw(void *x)
+{
+ __builtin_prefetch(x, 1, 3);
+}
#endif
#endif /* __KERNEL__ */