CVS Update@linux-mips.org: linux

[ralf@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ralf@ftp.linux-mips.org 05/03/02 19:18:46

Modified files:
        include/asm-mips: hazards.h 

Log message:
        One definition of back_to_back_c0_hazard too much.

diff -urN linux/include/asm-mips/hazards.h linux/include/asm-mips/hazards.h
--- linux/include/asm-mips/hazards.h    2005/03/01 18:12:06     1.8
+++ linux/include/asm-mips/hazards.h    2005/03/02 19:18:46     1.9
@@ -107,6 +107,7 @@
        "       .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 @@
                "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
 
 /*