Merge branch 'mipsr6-for-3.20' of git://git.linux-mips.org/pub/scm/mchandras/linux into mips-for-linux-next

1 files changed, 5 insertions, 4 deletions

diff --git a/arch/mips/include/asm/hazards.h b/arch/mips/include/asm/hazards.h
index e3ee92d4dbe7..4087b47ad1cb 100644
--- a/arch/mips/include/asm/hazards.h
+++ b/arch/mips/include/asm/hazards.h
@@ -11,6 +11,7 @@
 #define _ASM_HAZARDS_H
 
 #include <linux/stringify.h>
+#include <asm/compiler.h>
 
 #define ___ssnop                                                        \
         sll     $0, $0, 1
@@ -21,7 +22,7 @@
 /*
  * TLB hazards
  */
-#if defined(CONFIG_CPU_MIPSR2) && !defined(CONFIG_CPU_CAVIUM_OCTEON)
+#if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6) && !defined(CONFIG_CPU_CAVIUM_OCTEON)
 
 /*
  * MIPSR2 defines ehb for hazard avoidance
@@ -58,7 +59,7 @@ do {									\
         unsigned long tmp;                                              \
                                                                         \
         __asm__ __volatile__(                                           \
-        "       .set    mips64r2                                \n"     \
+        "       .set "MIPS_ISA_LEVEL"                           \n"     \
         "       dla     %0, 1f                                  \n"     \
         "       jr.hb   %0                                      \n"     \
         "       .set    mips0                                   \n"     \
@@ -132,7 +133,7 @@ do {									\
 
 #define instruction_hazard()                                            \
 do {                                                                    \
-        if (cpu_has_mips_r2)                                            \
+        if (cpu_has_mips_r2_r6)                                         \
                 __instruction_hazard();                                 \
 } while (0)
 
@@ -240,7 +241,7 @@ do {									\
 
 #define __disable_fpu_hazard
 
-#elif defined(CONFIG_CPU_MIPSR2)
+#elif defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6)
 
 #define __enable_fpu_hazard                                             \
         ___ehb