diff --git a/[refs] b/[refs]
index 8abcefdbf1e5..471dfe87d1ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d74f6bc85cbdc4601e5aea1e67ccbd259f0c7f4
+refs/heads/master: baee502ce2048aad5ec56acd24c950083a4697e7
diff --git a/trunk/arch/mips/math-emu/kernel_linkage.c b/trunk/arch/mips/math-emu/kernel_linkage.c
index 03d9a5560004..d187ab71c2ff 100644
--- a/trunk/arch/mips/math-emu/kernel_linkage.c
+++ b/trunk/arch/mips/math-emu/kernel_linkage.c
@@ -63,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;
 }
@@ -79,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;
 }
@@ -100,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;
 }
@@ -116,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;
 }
diff --git a/trunk/include/asm-mips/fpu_emulator.h b/trunk/include/asm-mips/fpu_emulator.h
index ea2fae10865f..42d883ba1a34 100644
--- a/trunk/include/asm-mips/fpu_emulator.h
+++ b/trunk/include/asm-mips/fpu_emulator.h
@@ -24,7 +24,6 @@
 #define _ASM_FPU_EMULATOR_H
 
 struct mips_fpu_emulator_private {
-	unsigned int eir;
 	struct {
 		unsigned int emulated;
 		unsigned int loads;