From 407a5929005da9f24d5c57c44b2876e3a68ac369 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Tue, 11 Jan 2011 14:39:35 +0900 Subject: [PATCH] --- yaml --- r: 230523 b: refs/heads/master c: c81fc389255d287dbfb17a70cd172663f962341a h: refs/heads/master i: 230521: 9dcfa2f385080269e804f0fccb4511be05c72dc3 230519: 160b3dce01d76537688de56c97d2f36a565b5c47 v: v3 --- [refs] | 2 +- trunk/arch/sh/include/asm/processor_32.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0b9d24840289..1a0a40e6d0ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 89e9fd32c6f4ed58cd6f6e3c3cf5b536a3f36100 +refs/heads/master: c81fc389255d287dbfb17a70cd172663f962341a diff --git a/trunk/arch/sh/include/asm/processor_32.h b/trunk/arch/sh/include/asm/processor_32.h index e3c73cdd8c90..900f8d72ffe2 100644 --- a/trunk/arch/sh/include/asm/processor_32.h +++ b/trunk/arch/sh/include/asm/processor_32.h @@ -194,15 +194,17 @@ extern unsigned long get_wchan(struct task_struct *p); #define KSTK_ESP(tsk) (task_pt_regs(tsk)->regs[15]) #if defined(CONFIG_CPU_SH2A) || defined(CONFIG_CPU_SH4) + #define PREFETCH_STRIDE L1_CACHE_BYTES #define ARCH_HAS_PREFETCH #define ARCH_HAS_PREFETCHW -static inline void prefetch(void *x) + +static inline void prefetch(const void *x) { __builtin_prefetch(x, 0, 3); } -static inline void prefetchw(void *x) +static inline void prefetchw(const void *x) { __builtin_prefetch(x, 1, 3); }