---

yaml --- r: 11150 b: refs/heads/master c: cc61c1f h: refs/heads/master v: v3
git-mirror · Oct 29, 2005 · e864d1d · e864d1d
1 parent 8c5dd6b
commit e864d1d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bbc7f22f6dca8a075b565ade49e9a982f89707c3
+refs/heads/master: cc61c1fede7d02cb8133ab0952ca3f3ba1f7fbb1
diff --git a/trunk/arch/mips/mm/c-r4k.c b/trunk/arch/mips/mm/c-r4k.c
@@ -529,6 +529,7 @@ static void r4k_flush_icache_range(unsigned long __user start,
 	args.end = end;
 
 	on_each_cpu(local_r4k_flush_icache_range, &args, 1, 1);
+	instruction_hazard();
 }
 
 /*

diff --git a/trunk/include/asm-mips/hazards.h b/trunk/include/asm-mips/hazards.h
@@ -228,6 +228,22 @@ __asm__(
 
 #endif
 
+#if defined(CONFIG_CPU_MIPS32_R2) || defined (CONFIG_CPU_MIPS64_R2)
+#define instruction_hazard()						\
+do {									\
+__label__ __next;							\
+	__asm__ __volatile__(						\
+	"	jr.hb	%0					\n"	\
+	:								\
+	: "r" (&&__next));						\
+__next:									\
+	;								\
+} while (0)
+
+#else
+#define instruction_hazard() do { } while (0)
+#endif
+
 #endif /* __ASSEMBLY__ */
 
 #endif /* _ASM_HAZARDS_H */
-Original file line number
+Diff line change
@@ Expand Up @@
     	args.end = end;
     	on_each_cpu(local_r4k_flush_icache_range, &args, 1, 1);
+    	instruction_hazard();
     }
     /*
@@ Expand Down @@