From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 2 Mar 2005 19:18:46 +0000 (+0000)
Subject: One definition of back_to_back_c0_hazard too much.
X-Git-Tag: v2.6.15-rc1~731^2~1^2~260
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88d535b6b58632bc51ee9a1f35ddfc357e365c37;p=linux-2.6

One definition of back_to_back_c0_hazard too much.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/include/asm-mips/hazards.h b/include/asm-mips/hazards.h
index d6e88cf06b..181f08de88 100644
--- a/include/asm-mips/hazards.h
+++ b/include/asm-mips/hazards.h
@@ -107,6 +107,7 @@ __asm__(
 	"	.endm						\n\t");
 
 #ifdef CONFIG_CPU_RM9000
+
 /*
  * RM9000 hazards.  When the JTLB is updated by tlbwi or tlbwr, a subsequent
  * use of the JTLB for instructions should not occur for 4 cpu cycles and use
@@ -144,12 +145,6 @@ __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
 
 /*