Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f9509c84d8d9451ecd1731e922e7094b38ee336a
Commit: f9509c84d8d9451ecd1731e922e7094b38ee336a
Parent: 79894c7b47f78decaa3511f1d6646aa06e2c6bed
Author: Chris Dearman <[EMAIL PROTECTED]>
AuthorDate: Thu May 17 21:36:55 2007 +0100
Committer: Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Wed Jun 6 19:34:31 2007 +0100
[MIPS] Remove duplicate fpu enable hazard code.
Use common code from hazards.h instead.
Signed-off-by: Chris Dearman <[EMAIL PROTECTED]>
Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
arch/mips/kernel/r4k_switch.S | 2 +-
include/asm-mips/asmmacro.h | 15 ---------------
2 files changed, 1 insertions(+), 16 deletions(-)
diff --git a/arch/mips/kernel/r4k_switch.S b/arch/mips/kernel/r4k_switch.S
index cc566cf..0672959 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 92e62ef..c5f20df 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
*/
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
