This commit was manufactured by cvs2svn to create tag

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

diff --git a/arch/ppc64/kernel/signal.c b/arch/ppc64/kernel/signal.c
index 1e228bd..3d6d758 100644 (file)
--- a/arch/ppc64/kernel/signal.c
+++ b/arch/ppc64/kernel/signal.c
@@ -180,9 +180,6 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig,
        unsigned long err = 0;
        unsigned long save_r13 = 0;
        elf_greg_t *gregs = (elf_greg_t *)regs;
-#ifdef CONFIG_ALTIVEC
-       unsigned long msr;
-#endif
        int i;
 
        /* If this is not a signal return, we preserve the TLS in r13 */
@@ -208,15 +205,13 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig,
 
 #ifdef CONFIG_ALTIVEC
        err |= __get_user(v_regs, &sc->v_regs);
-       err |= __get_user(msr, &sc->gp_regs[PT_MSR]);
        if (err)
                return err;
        /* Copy 33 vec registers (vr0..31 and vscr) from the stack */
-       if (v_regs != 0 && (msr & MSR_VEC) != 0)
-               err |= __copy_from_user(current->thread.vr, v_regs,
-                                       33 * sizeof(vector128));
+       if (v_regs != 0 && (regs->msr & MSR_VEC) != 0)
+               err |= __copy_from_user(current->thread.vr, v_regs, 33 * sizeof(vector128));
        else if (current->thread.used_vr)
-               memset(current->thread.vr, 0, 33 * sizeof(vector128));
+               memset(&current->thread.vr, 0, 33);
        /* Always get VRSAVE back */
        if (v_regs != 0)
                err |= __get_user(current->thread.vrsave, (u32 __user *)&v_regs[33]);
@@ -224,14 +219,6 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig,
                current->thread.vrsave = 0;
 #endif /* CONFIG_ALTIVEC */
 
-#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;
-       preempt_enable();
-#endif
        /* Force reload of FP/VEC */
        regs->msr &= ~(MSR_FP | MSR_FE0 | MSR_FE1 | MSR_VEC);
 
@@ -388,7 +375,7 @@ badframe:
        return 0;
 }
 
-static int setup_rt_frame(int signr, struct k_sigaction *ka, siginfo_t *info,
+static void setup_rt_frame(int signr, struct k_sigaction *ka, siginfo_t *info,
                sigset_t *set, struct pt_regs *regs)
 {
        /* Handler is *really* a pointer to the function descriptor for
@@ -456,7 +443,7 @@ static int setup_rt_frame(int signr, struct k_sigaction *ka, siginfo_t *info,
        if (test_thread_flag(TIF_SINGLESTEP))
                ptrace_notify(SIGTRAP);
 
-       return 1;
+       return;
 
 badframe:
 #if DEBUG_SIG
@@ -464,30 +451,25 @@ badframe:
               regs, frame, newsp);
 #endif
        force_sigsegv(signr, current);
-       return 0;
 }
 
 
 /*
  * OK, we're invoking a handler
  */
-static int handle_signal(unsigned long sig, struct k_sigaction *ka,
-                        siginfo_t *info, sigset_t *oldset, struct pt_regs *regs)
+static void handle_signal(unsigned long sig, struct k_sigaction *ka,
+                         siginfo_t *info, sigset_t *oldset, struct pt_regs *regs)
 {
-       int ret;
-
        /* Set up Signal Frame */
-       ret = setup_rt_frame(sig, ka, info, oldset, regs);
+       setup_rt_frame(sig, ka, info, oldset, regs);
 
-       if (ret && !(ka->sa.sa_flags & SA_NODEFER)) {
+       if (!(ka->sa.sa_flags & SA_NODEFER)) {
                spin_lock_irq(&current->sighand->siglock);
                sigorsets(&current->blocked, &current->blocked, &ka->sa.sa_mask);
                sigaddset(&current->blocked,sig);
                recalc_sigpending();
                spin_unlock_irq(&current->sighand->siglock);
        }
-
-       return ret;
 }
 
 static inline void syscall_restart(struct pt_regs *regs, struct k_sigaction *ka)
@@ -547,7 +529,8 @@ int do_signal(sigset_t *oldset, struct pt_regs *regs)
                /* Whee!  Actually deliver the signal.  */
                if (TRAP(regs) == 0x0C00)
                        syscall_restart(regs, &ka);
-               return handle_signal(signr, &ka, &info, oldset, regs);
+               handle_signal(signr, &ka, &info, oldset, regs);
+               return 1;
        }
 
        if (TRAP(regs) == 0x0C00) {     /* System Call! */