Merge branch '4.1-fp' into mips-for-linux-next

diff --cc arch/mips/include/asm/asmmacro-32.h
index 8deb906,8038647..0ef39ad
--- 1/arch/mips/include/asm/asmmacro-32.h
--- 2/arch/mips/include/asm/asmmacro-32.h
+++ b/arch/mips/include/asm/asmmacro-32.h
@@@ -16,22 -16,38 +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)
 -      swc1    $f0,  THREAD_FPR0(\thread)
 -      swc1    $f1,  THREAD_FPR1(\thread)
 -      swc1    $f2,  THREAD_FPR2(\thread)
 -      swc1    $f3,  THREAD_FPR3(\thread)
 -      swc1    $f4,  THREAD_FPR4(\thread)
 -      swc1    $f5,  THREAD_FPR5(\thread)
 -      swc1    $f6,  THREAD_FPR6(\thread)
 -      swc1    $f7,  THREAD_FPR7(\thread)
 -      swc1    $f8,  THREAD_FPR8(\thread)
 -      swc1    $f9,  THREAD_FPR9(\thread)
 -      swc1    $f10, THREAD_FPR10(\thread)
 -      swc1    $f11, THREAD_FPR11(\thread)
 -      swc1    $f12, THREAD_FPR12(\thread)
 -      swc1    $f13, THREAD_FPR13(\thread)
 -      swc1    $f14, THREAD_FPR14(\thread)
 -      swc1    $f15, THREAD_FPR15(\thread)
 -      swc1    $f16, THREAD_FPR16(\thread)
 -      swc1    $f17, THREAD_FPR17(\thread)
 -      swc1    $f18, THREAD_FPR18(\thread)
 -      swc1    $f19, THREAD_FPR19(\thread)
 -      swc1    $f20, THREAD_FPR20(\thread)
 -      swc1    $f21, THREAD_FPR21(\thread)
 -      swc1    $f22, THREAD_FPR22(\thread)
 -      swc1    $f23, THREAD_FPR23(\thread)
 -      swc1    $f24, THREAD_FPR24(\thread)
 -      swc1    $f25, THREAD_FPR25(\thread)
 -      swc1    $f26, THREAD_FPR26(\thread)
 -      swc1    $f27, THREAD_FPR27(\thread)
 -      swc1    $f28, THREAD_FPR28(\thread)
 -      swc1    $f29, THREAD_FPR29(\thread)
 -      swc1    $f30, THREAD_FPR30(\thread)
 -      swc1    $f31, THREAD_FPR31(\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 -56,38 +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)
 -      lwc1    $f0,  THREAD_FPR0(\thread)
 -      lwc1    $f1,  THREAD_FPR1(\thread)
 -      lwc1    $f2,  THREAD_FPR2(\thread)
 -      lwc1    $f3,  THREAD_FPR3(\thread)
 -      lwc1    $f4,  THREAD_FPR4(\thread)
 -      lwc1    $f5,  THREAD_FPR5(\thread)
 -      lwc1    $f6,  THREAD_FPR6(\thread)
 -      lwc1    $f7,  THREAD_FPR7(\thread)
 -      lwc1    $f8,  THREAD_FPR8(\thread)
 -      lwc1    $f9,  THREAD_FPR9(\thread)
 -      lwc1    $f10, THREAD_FPR10(\thread)
 -      lwc1    $f11, THREAD_FPR11(\thread)
 -      lwc1    $f12, THREAD_FPR12(\thread)
 -      lwc1    $f13, THREAD_FPR13(\thread)
 -      lwc1    $f14, THREAD_FPR14(\thread)
 -      lwc1    $f15, THREAD_FPR15(\thread)
 -      lwc1    $f16, THREAD_FPR16(\thread)
 -      lwc1    $f17, THREAD_FPR17(\thread)
 -      lwc1    $f18, THREAD_FPR18(\thread)
 -      lwc1    $f19, THREAD_FPR19(\thread)
 -      lwc1    $f20, THREAD_FPR20(\thread)
 -      lwc1    $f21, THREAD_FPR21(\thread)
 -      lwc1    $f22, THREAD_FPR22(\thread)
 -      lwc1    $f23, THREAD_FPR23(\thread)
 -      lwc1    $f24, THREAD_FPR24(\thread)
 -      lwc1    $f25, THREAD_FPR25(\thread)
 -      lwc1    $f26, THREAD_FPR26(\thread)
 -      lwc1    $f27, THREAD_FPR27(\thread)
 -      lwc1    $f28, THREAD_FPR28(\thread)
 -      lwc1    $f29, THREAD_FPR29(\thread)
 -      lwc1    $f30, THREAD_FPR30(\thread)
 -      lwc1    $f31, THREAD_FPR31(\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

diff --cc arch/mips/include/asm/fpu.h
Simple merge

diff --cc arch/mips/kernel/genex.S
Simple merge

diff --cc arch/mips/kernel/ptrace.c
Simple merge