Pārlūkot izejas kodu

[MIPS] Remove duplicate fpu enable hazard code.

Use common code from hazards.h instead.

Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Chris Dearman 18 gadi atpakaļ
vecāks
revīzija
f9509c84d8
2 mainītis faili ar 1 papildinājumiem un 16 dzēšanām
  1. 1 1
      arch/mips/kernel/r4k_switch.S
  2. 0 15
      include/asm-mips/asmmacro.h

+ 1 - 1
arch/mips/kernel/r4k_switch.S

@@ -174,7 +174,7 @@ LEAF(_init_fpu)
 	or	t0, t1
 	or	t0, t1
 	mtc0	t0, CP0_STATUS
 	mtc0	t0, CP0_STATUS
 #endif /* CONFIG_MIPS_MT_SMTC */
 #endif /* CONFIG_MIPS_MT_SMTC */
-	fpu_enable_hazard
+	enable_fpu_hazard
 
 
 	li	t1, FPU_DEFAULT
 	li	t1, FPU_DEFAULT
 	ctc1	t1, fcr31
 	ctc1	t1, fcr31

+ 0 - 15
include/asm-mips/asmmacro.h

@@ -52,21 +52,6 @@
 	.endm
 	.endm
 #endif /* CONFIG_MIPS_MT_SMTC */
 #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
  * Temporary until all gas have MT ASE support
  */
  */