Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

[linux-2.6-omap-h63xx.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 4002f0cf79f3d443651761b54185b82ed5988c06..d187ab71c2ff17d4178248fa625cfe86f9a6a940 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,7 +78,6 @@ 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;
 }
@@ -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;
 }