1 files changed, 2 insertions, 74 deletions

diff --git a/arch/mips/math-emu/kernel_linkage.c b/arch/mips/math-emu/kernel_linkage.c
index 3aeae07ed5b8..eb58a85b3157 100644
--- a/arch/mips/math-emu/kernel_linkage.c
+++ b/arch/mips/math-emu/kernel_linkage.c
@@ -40,78 +40,6 @@ void fpu_emulator_init_fpu(void)
         }
 
         current->thread.fpu.fcr31 = 0;
-        for (i = 0; i < 32; i++) {
-                current->thread.fpu.fpr[i] = SIGNALLING_NAN;
-        }
-}
-
-
-/*
- * Emulator context save/restore to/from a signal context
- * presumed to be on the user stack, and therefore accessed
- * with appropriate macros from uaccess.h
- */
-
-int fpu_emulator_save_context(struct sigcontext __user *sc)
-{
-        int i;
-        int err = 0;
-
-        for (i = 0; i < 32; i++) {
-                err |=
-                    __put_user(current->thread.fpu.fpr[i], &sc->sc_fpregs[i]);
-        }
-        err |= __put_user(current->thread.fpu.fcr31, &sc->sc_fpc_csr);
-
-        return err;
-}
-
-int fpu_emulator_restore_context(struct sigcontext __user *sc)
-{
-        int i;
-        int err = 0;
-
-        for (i = 0; i < 32; i++) {
-                err |=
-                    __get_user(current->thread.fpu.fpr[i], &sc->sc_fpregs[i]);
-        }
-        err |= __get_user(current->thread.fpu.fcr31, &sc->sc_fpc_csr);
-
-        return err;
-}
-
-#ifdef CONFIG_64BIT
-/*
- * This is the o32 version
- */
-
-int fpu_emulator_save_context32(struct sigcontext32 __user *sc)
-{
-        int i;
-        int err = 0;
-        int inc = test_thread_flag(TIF_32BIT_FPREGS) ? 2 : 1;
-
-        for (i = 0; i < 32; i += inc) {
-                err |=
-                    __put_user(current->thread.fpu.fpr[i], &sc->sc_fpregs[i]);
-        }
-        err |= __put_user(current->thread.fpu.fcr31, &sc->sc_fpc_csr);
-
-        return err;
-}
-
-int fpu_emulator_restore_context32(struct sigcontext32 __user *sc)
-{
-        int i;
-        int err = 0;
-        int inc = test_thread_flag(TIF_32BIT_FPREGS) ? 2 : 1;
-
-        for (i = 0; i < 32; i += inc) {
-                err |=
-                    __get_user(current->thread.fpu.fpr[i], &sc->sc_fpregs[i]);
-        }
-        err |= __get_user(current->thread.fpu.fcr31, &sc->sc_fpc_csr);
-
-        return err;
+        for (i = 0; i < 32; i++)
+                set_fpr64(&current->thread.fpu.fpr[i], 0, SIGNALLING_NAN);
 }
-#endif