2 files changed, 1 insertions, 16 deletions

diff --git a/arch/mips/kernel/r4k_switch.S b/arch/mips/kernel/r4k_switch.S
index cc566cf12246..06729596812f 100644
--- a/arch/mips/kernel/r4k_switch.S
+++ b/arch/mips/kernel/r4k_switch.S
@@ -174,7 +174,7 @@ LEAF(_init_fpu)
         or      t0, t1
         mtc0    t0, CP0_STATUS
 #endif /* CONFIG_MIPS_MT_SMTC */
-        fpu_enable_hazard
+        enable_fpu_hazard
 
         li      t1, FPU_DEFAULT
         ctc1    t1, fcr31
diff --git a/include/asm-mips/asmmacro.h b/include/asm-mips/asmmacro.h
index 92e62ef711ed..c5f20df780e9 100644
--- a/include/asm-mips/asmmacro.h
+++ b/include/asm-mips/asmmacro.h
@@ -52,21 +52,6 @@
         .endm
 #endif /* CONFIG_MIPS_MT_SMTC */
 
-#ifdef CONFIG_CPU_SB1
-        .macro  fpu_enable_hazard
-        .set    push
-        .set    noreorder
-        .set    mips2
-        SSNOP
-        bnezl   $0, .+4
-         SSNOP
-        .set    pop
-        .endm
-#else
-        .macro  fpu_enable_hazard
-        .endm
-#endif
-
 /*
  * Temporary until all gas have MT ASE support
  */