From fabf70585bcdd59cb140db204e8c1de3509aecca Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 1 Mar 2005 18:12:06 +0000
Subject: [PATCH] --- yaml --- r: 11031 b: refs/heads/master c:
 5068debff2dcbc8f624811e3c06d60c7c0bba744 h: refs/heads/master i:   11029:
 ed233971ab1710c68f12098d3b65ffa3d9c611d8   11027:
 4903eabe64c820b25207c4ee43daef4ac0f3ff40   11023:
 5874faff7d4cf933c0e3f7eb4f8d65655a636677 v: v3

---
 [refs]                           |  2 +-
 trunk/include/asm-mips/hazards.h | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 74a4069576d8..c00ea500c8a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f04afb59565c3029563b9a79b3513c9f3327a27
+refs/heads/master: 5068debff2dcbc8f624811e3c06d60c7c0bba744
diff --git a/trunk/include/asm-mips/hazards.h b/trunk/include/asm-mips/hazards.h
index f524eaccd5f1..d6e88cf06ba9 100644
--- a/trunk/include/asm-mips/hazards.h
+++ b/trunk/include/asm-mips/hazards.h
@@ -124,6 +124,9 @@ __asm__(
 		".set\tmips32\n\t"					\
 		"_ssnop; _ssnop; _ssnop; _ssnop\n\t"			\
 		".set\tmips0")
+
+#define back_to_back_c0_hazard()	do { } while (0)
+
 #else
 
 /*
@@ -141,6 +144,12 @@ __asm__(
 		"nop; nop; nop; nop; nop; nop;\n\t"			\
 		".set reorder\n\t")
 
+#define back_to_back_c0_hazard()					\
+	__asm__ __volatile__(						\
+	"	.set noreorder				\n"		\
+	"	nop; nop; nop				\n"		\
+	"	.set reorder				\n")
+
 #endif
 
 /*
@@ -170,6 +179,10 @@ __asm__(
 	__asm__ __volatile__(						\
 	"_ehb\t\t\t\t# irq_disable_hazard")
 
+#define back_to_back_c0_hazard()					\
+	__asm__ __volatile__(						\
+	"_ehb\t\t\t\t# back_to_back_c0_hazard")
+
 #elif defined(CONFIG_CPU_R10000) || defined(CONFIG_CPU_RM9000)
 
 /*
@@ -186,6 +199,8 @@ __asm__(
 #define irq_enable_hazard()	do { } while (0)
 #define irq_disable_hazard()	do { } while (0)
 
+#define back_to_back_c0_hazard()	do { } while (0)
+
 #else
 
 /*
@@ -210,6 +225,12 @@ __asm__(
 	__asm__ __volatile__(						\
 	"_ssnop; _ssnop; _ssnop;\t\t# irq_disable_hazard")
 
+#define back_to_back_c0_hazard()					\
+	__asm__ __volatile__(						\
+	"	.set noreorder				\n"		\
+	"	nop; nop; nop				\n"		\
+	"	.set reorder				\n")
+
 #endif
 
 #endif /* __ASSEMBLY__ */