Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[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 04397fe..d187ab7 100644 (file)
--- a/arch/mips/math-emu/kernel_linkage.c
+++ b/arch/mips/math-emu/kernel_linkage.c
@@ -27,8 +27,6 @@
 
 #include <asm/fpu_emulator.h>
 
-extern struct mips_fpu_emulator_private fpuemuprivate;
-
 #define SIGNALLING_NAN 0x7ff800007ff80000LL
 
 void fpu_emulator_init_fpu(void)
@@ -65,7 +63,6 @@ int fpu_emulator_save_context(struct sigcontext *sc)
                               &sc->sc_fpregs[i]);
        }
        err |= __put_user(current->thread.fpu.soft.fcr31, &sc->sc_fpc_csr);
-       err |= __put_user(fpuemuprivate.eir, &sc->sc_fpc_eir);
 
        return err;
 }
@@ -81,12 +78,11 @@ int fpu_emulator_restore_context(struct sigcontext *sc)
                               &sc->sc_fpregs[i]);
        }
        err |= __get_user(current->thread.fpu.soft.fcr31, &sc->sc_fpc_csr);
-       err |= __get_user(fpuemuprivate.eir, &sc->sc_fpc_eir);
 
        return err;
 }
 
-#ifdef CONFIG_MIPS64
+#ifdef CONFIG_64BIT
 /*
  * This is the o32 version
  */
@@ -102,7 +98,6 @@ int fpu_emulator_save_context32(struct sigcontext32 *sc)
                               &sc->sc_fpregs[i]);
        }
        err |= __put_user(current->thread.fpu.soft.fcr31, &sc->sc_fpc_csr);
-       err |= __put_user(fpuemuprivate.eir, &sc->sc_fpc_eir);
 
        return err;
 }
@@ -118,7 +113,6 @@ int fpu_emulator_restore_context32(struct sigcontext32 *sc)
                               &sc->sc_fpregs[i]);
        }
        err |= __get_user(current->thread.fpu.soft.fcr31, &sc->sc_fpc_csr);
-       err |= __get_user(fpuemuprivate.eir, &sc->sc_fpc_eir);
 
        return err;
 }