Merge branch '4.1-fp' into mips-for-linux-next
diff --git a/arch/mips/include/asm/asmmacro-32.h b/arch/mips/include/asm/asmmacro-32.h
index 8deb906..0ef39ad 100644
--- a/arch/mips/include/asm/asmmacro-32.h
+++ b/arch/mips/include/asm/asmmacro-32.h
@@ -16,22 +16,22 @@
.set push
SET_HARDFLOAT
cfc1 \tmp, fcr31
- s.d $f0, THREAD_FPR0_LS64(\thread)
- s.d $f2, THREAD_FPR2_LS64(\thread)
- s.d $f4, THREAD_FPR4_LS64(\thread)
- s.d $f6, THREAD_FPR6_LS64(\thread)
- s.d $f8, THREAD_FPR8_LS64(\thread)
- s.d $f10, THREAD_FPR10_LS64(\thread)
- s.d $f12, THREAD_FPR12_LS64(\thread)
- s.d $f14, THREAD_FPR14_LS64(\thread)
- s.d $f16, THREAD_FPR16_LS64(\thread)
- s.d $f18, THREAD_FPR18_LS64(\thread)
- s.d $f20, THREAD_FPR20_LS64(\thread)
- s.d $f22, THREAD_FPR22_LS64(\thread)
- s.d $f24, THREAD_FPR24_LS64(\thread)
- s.d $f26, THREAD_FPR26_LS64(\thread)
- s.d $f28, THREAD_FPR28_LS64(\thread)
- s.d $f30, THREAD_FPR30_LS64(\thread)
+ s.d $f0, THREAD_FPR0(\thread)
+ s.d $f2, THREAD_FPR2(\thread)
+ s.d $f4, THREAD_FPR4(\thread)
+ s.d $f6, THREAD_FPR6(\thread)
+ s.d $f8, THREAD_FPR8(\thread)
+ s.d $f10, THREAD_FPR10(\thread)
+ s.d $f12, THREAD_FPR12(\thread)
+ s.d $f14, THREAD_FPR14(\thread)
+ s.d $f16, THREAD_FPR16(\thread)
+ s.d $f18, THREAD_FPR18(\thread)
+ s.d $f20, THREAD_FPR20(\thread)
+ s.d $f22, THREAD_FPR22(\thread)
+ s.d $f24, THREAD_FPR24(\thread)
+ s.d $f26, THREAD_FPR26(\thread)
+ s.d $f28, THREAD_FPR28(\thread)
+ s.d $f30, THREAD_FPR30(\thread)
sw \tmp, THREAD_FCR31(\thread)
.set pop
.endm
@@ -40,22 +40,22 @@
.set push
SET_HARDFLOAT
lw \tmp, THREAD_FCR31(\thread)
- l.d $f0, THREAD_FPR0_LS64(\thread)
- l.d $f2, THREAD_FPR2_LS64(\thread)
- l.d $f4, THREAD_FPR4_LS64(\thread)
- l.d $f6, THREAD_FPR6_LS64(\thread)
- l.d $f8, THREAD_FPR8_LS64(\thread)
- l.d $f10, THREAD_FPR10_LS64(\thread)
- l.d $f12, THREAD_FPR12_LS64(\thread)
- l.d $f14, THREAD_FPR14_LS64(\thread)
- l.d $f16, THREAD_FPR16_LS64(\thread)
- l.d $f18, THREAD_FPR18_LS64(\thread)
- l.d $f20, THREAD_FPR20_LS64(\thread)
- l.d $f22, THREAD_FPR22_LS64(\thread)
- l.d $f24, THREAD_FPR24_LS64(\thread)
- l.d $f26, THREAD_FPR26_LS64(\thread)
- l.d $f28, THREAD_FPR28_LS64(\thread)
- l.d $f30, THREAD_FPR30_LS64(\thread)
+ l.d $f0, THREAD_FPR0(\thread)
+ l.d $f2, THREAD_FPR2(\thread)
+ l.d $f4, THREAD_FPR4(\thread)
+ l.d $f6, THREAD_FPR6(\thread)
+ l.d $f8, THREAD_FPR8(\thread)
+ l.d $f10, THREAD_FPR10(\thread)
+ l.d $f12, THREAD_FPR12(\thread)
+ l.d $f14, THREAD_FPR14(\thread)
+ l.d $f16, THREAD_FPR16(\thread)
+ l.d $f18, THREAD_FPR18(\thread)
+ l.d $f20, THREAD_FPR20(\thread)
+ l.d $f22, THREAD_FPR22(\thread)
+ l.d $f24, THREAD_FPR24(\thread)
+ l.d $f26, THREAD_FPR26(\thread)
+ l.d $f28, THREAD_FPR28(\thread)
+ l.d $f30, THREAD_FPR30(\thread)
ctc1 \tmp, fcr31
.set pop
.endm