This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / ppc / kernel / signal.c

diff --git a/arch/ppc/kernel/signal.c b/arch/ppc/kernel/signal.c
index b2bc832..260716a 100644 (file)
--- a/arch/ppc/kernel/signal.c
+++ b/arch/ppc/kernel/signal.c
@@ -290,7 +290,7 @@ restore_user_regs(struct pt_regs *regs, struct mcontext __user *sr, int sig)
 
        /* force the process to reload the FP registers from
           current->thread when it next does FP instructions */
-       regs->msr &= ~(MSR_FP | MSR_FE0 | MSR_FE1);
+       regs->msr &= ~MSR_FP;
        if (__copy_from_user(current->thread.fpr, &sr->mc_fregs,
                             sizeof(sr->mc_fregs)))
                return 1;
@@ -319,7 +319,7 @@ restore_user_regs(struct pt_regs *regs, struct mcontext __user *sr, int sig)
        if (!__get_user(msr, &sr->mc_gregs[PT_MSR]) && (msr & MSR_SPE) != 0) {
                /* restore spe registers from the stack */
                if (__copy_from_user(current->thread.evr, &sr->mc_vregs,
-                                    ELF_NEVRREG * sizeof(u32)))
+                                    sizeof(sr->mc_vregs)))
                        return 1;
        } else if (current->thread.used_spe)
                memset(&current->thread.evr, 0, ELF_NEVRREG * sizeof(u32));
@@ -329,16 +329,6 @@ restore_user_regs(struct pt_regs *regs, struct mcontext __user *sr, int sig)
                return 1;
 #endif /* CONFIG_SPE */
 
-#ifndef CONFIG_SMP
-       preempt_disable();
-       if (last_task_used_math == current)
-               last_task_used_math = NULL;
-       if (last_task_used_altivec == current)
-               last_task_used_altivec = NULL;
-       if (last_task_used_spe == current)
-               last_task_used_spe = NULL;
-       preempt_enable();
-#endif
        return 0;
 }