diff options
Diffstat (limited to 'arch/mips/include/asm/hazards.h')
| -rw-r--r-- | arch/mips/include/asm/hazards.h | 7 | 
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/mips/include/asm/hazards.h b/arch/mips/include/asm/hazards.h index 4e332165d7b..b4c20e4f87c 100644 --- a/arch/mips/include/asm/hazards.h +++ b/arch/mips/include/asm/hazards.h @@ -87,7 +87,8 @@ do {									\  	: "=r" (tmp));							\  } while (0) -#elif defined(CONFIG_CPU_MIPSR1) && !defined(CONFIG_MIPS_ALCHEMY) +#elif (defined(CONFIG_CPU_MIPSR1) && !defined(CONFIG_MIPS_ALCHEMY)) || \ +	defined(CONFIG_CPU_BMIPS)  /*   * These are slightly complicated by the fact that we guarantee R1 kernels to @@ -139,8 +140,8 @@ do {									\  } while (0)  #elif defined(CONFIG_MIPS_ALCHEMY) || defined(CONFIG_CPU_CAVIUM_OCTEON) || \ -      defined(CONFIG_CPU_LOONGSON2) || defined(CONFIG_CPU_R10000) || \ -      defined(CONFIG_CPU_R5500) +	defined(CONFIG_CPU_LOONGSON2) || defined(CONFIG_CPU_R10000) || \ +	defined(CONFIG_CPU_R5500)  /*   * R10000 rocks - all hazards handled in hardware, so this becomes a nobrainer.  |