linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / mips / math-emu / kernel_linkage.c

diff --git a/arch/mips/math-emu/kernel_linkage.c b/arch/mips/math-emu/kernel_linkage.c
index 5b3390f..d187ab7 100644 (file)
--- a/arch/mips/math-emu/kernel_linkage.c
+++ b/arch/mips/math-emu/kernel_linkage.c
@@ -19,6 +19,7 @@
  * manipulation primitives for the Algorithmics MIPS
  * FPU Emulator
  */
+#include <linux/config.h>
 #include <linux/sched.h>
 #include <asm/processor.h>
 #include <asm/signal.h>
@@ -38,9 +39,9 @@ void fpu_emulator_init_fpu(void)
                printk("Algorithmics/MIPS FPU Emulator v1.5\n");
        }
 
-       current->thread.fpu.fcr31 = 0;
+       current->thread.fpu.soft.fcr31 = 0;
        for (i = 0; i < 32; i++) {
-               current->thread.fpu.fpr[i] = SIGNALLING_NAN;
+               current->thread.fpu.soft.fpr[i] = SIGNALLING_NAN;
        }
 }
 
@@ -58,9 +59,10 @@ int fpu_emulator_save_context(struct sigcontext *sc)
 
        for (i = 0; i < 32; i++) {
                err |=
-                   __put_user(current->thread.fpu.fpr[i], &sc->sc_fpregs[i]);
+                   __put_user(current->thread.fpu.soft.fpr[i],
+                              &sc->sc_fpregs[i]);
        }
-       err |= __put_user(current->thread.fpu.fcr31, &sc->sc_fpc_csr);
+       err |= __put_user(current->thread.fpu.soft.fcr31, &sc->sc_fpc_csr);
 
        return err;
 }
@@ -72,9 +74,10 @@ int fpu_emulator_restore_context(struct sigcontext *sc)
 
        for (i = 0; i < 32; i++) {
                err |=
-                   __get_user(current->thread.fpu.fpr[i], &sc->sc_fpregs[i]);
+                   __get_user(current->thread.fpu.soft.fpr[i],
+                              &sc->sc_fpregs[i]);
        }
-       err |= __get_user(current->thread.fpu.fcr31, &sc->sc_fpc_csr);
+       err |= __get_user(current->thread.fpu.soft.fcr31, &sc->sc_fpc_csr);
 
        return err;
 }
@@ -91,9 +94,10 @@ int fpu_emulator_save_context32(struct sigcontext32 *sc)
 
        for (i = 0; i < 32; i+=2) {
                err |=
-                   __put_user(current->thread.fpu.fpr[i], &sc->sc_fpregs[i]);
+                   __put_user(current->thread.fpu.soft.fpr[i],
+                              &sc->sc_fpregs[i]);
        }
-       err |= __put_user(current->thread.fpu.fcr31, &sc->sc_fpc_csr);
+       err |= __put_user(current->thread.fpu.soft.fcr31, &sc->sc_fpc_csr);
 
        return err;
 }
@@ -105,9 +109,10 @@ int fpu_emulator_restore_context32(struct sigcontext32 *sc)
 
        for (i = 0; i < 32; i+=2) {
                err |=
-                   __get_user(current->thread.fpu.fpr[i], &sc->sc_fpregs[i]);
+                   __get_user(current->thread.fpu.soft.fpr[i],
+                              &sc->sc_fpregs[i]);
        }
-       err |= __get_user(current->thread.fpu.fcr31, &sc->sc_fpc_csr);
+       err |= __get_user(current->thread.fpu.soft.fcr31, &sc->sc_fpc_csr);
 
        return err;
 }