upgrade to linux 2.6.10-1.12_FC2

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

diff --git a/arch/ppc64/kernel/signal32.c b/arch/ppc64/kernel/signal32.c
index 2af9d8d..bdc0d62 100644 (file)
--- a/arch/ppc64/kernel/signal32.c
+++ b/arch/ppc64/kernel/signal32.c
@@ -228,13 +228,21 @@ static long restore_user_regs(struct pt_regs *regs,
                                     sizeof(sr->mc_vregs)))
                        return 1;
        } else if (current->thread.used_vr)
-               memset(&current->thread.vr, 0, ELF_NVRREG32 * sizeof(vector128));
+               memset(current->thread.vr, 0, ELF_NVRREG32 * sizeof(vector128));
 
        /* Always get VRSAVE back */
        if (__get_user(current->thread.vrsave, (u32 __user *)&sr->mc_vregs[32]))
                return 1;
 #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
        return 0;
 }
 
@@ -277,12 +285,10 @@ long sys32_sigsuspend(old_sigset_t mask, int p2, int p3, int p4, int p6, int p7,
                schedule();
                if (do_signal32(&saveset, regs))
                        /*
-                        * If a signal handler needs to be called,
-                        * do_signal32() has set R3 to the signal number (the
-                        * first argument of the signal handler), so don't
-                        * overwrite that with EINTR !
-                        * In the other cases, do_signal32() doesn't touch 
-                        * R3, so it's still set to -EINTR (see above).
+                        * Returning 0 means we return to userspace via
+                        * ret_from_except and thus restore all user
+                        * registers from *regs.  This is what we need
+                        * to do when a signal has been delivered.
                         */
                        return 0;
        }
@@ -580,12 +586,10 @@ int sys32_rt_sigsuspend(compat_sigset_t __user * unewset, size_t sigsetsize, int
                schedule();
                if (do_signal32(&saveset, regs))
                        /*
-                        * If a signal handler needs to be called,
-                        * do_signal32() has set R3 to the signal number (the
-                        * first argument of the signal handler), so don't
-                        * overwrite that with EINTR !
-                        * In the other cases, do_signal32() doesn't touch 
-                        * R3, so it's still set to -EINTR (see above).
+                        * Returning 0 means we return to userspace via
+                        * ret_from_except and thus restore all user
+                        * registers from *regs.  This is what we need
+                        * to do when a signal has been delivered.
                         */
                        return 0;
        }
@@ -646,9 +650,9 @@ int sys32_sigaltstack(u32 __new, u32 __old, int r5,
  * Set up a signal frame for a "real-time" signal handler
  * (one which gets siginfo).
  */
-static void handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
-                              siginfo_t *info, sigset_t *oldset,
-                              struct pt_regs * regs, unsigned long newsp)
+static int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
+                             siginfo_t *info, sigset_t *oldset,
+                             struct pt_regs * regs, unsigned long newsp)
 {
        struct rt_sigframe32 __user *rt_sf;
        struct mcontext32 __user *frame;
@@ -700,7 +704,7 @@ static void handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
        if (test_thread_flag(TIF_SINGLESTEP))
                ptrace_notify(SIGTRAP);
 
-       return;
+       return 1;
 
 badframe:
 #if DEBUG_SIG
@@ -708,6 +712,7 @@ badframe:
               regs, frame, newsp);
 #endif
        force_sigsegv(sig, current);
+       return 0;
 }
 
 static long do_setcontext32(struct ucontext32 __user *ucp, struct pt_regs *regs, int sig)
@@ -818,7 +823,7 @@ long sys32_rt_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8,
 /*
  * OK, we're invoking a handler
  */
-static void handle_signal32(unsigned long sig, struct k_sigaction *ka,
+static int handle_signal32(unsigned long sig, struct k_sigaction *ka,
                            siginfo_t *info, sigset_t *oldset,
                            struct pt_regs * regs, unsigned long newsp)
 {
@@ -866,7 +871,7 @@ static void handle_signal32(unsigned long sig, struct k_sigaction *ka,
        if (test_thread_flag(TIF_SINGLESTEP))
                ptrace_notify(SIGTRAP);
 
-       return;
+       return 1;
 
 badframe:
 #if DEBUG_SIG
@@ -874,6 +879,7 @@ badframe:
               regs, frame, *newspp);
 #endif
        force_sigsegv(sig, current);
+       return 0;
 }
 
 /*
@@ -983,11 +989,11 @@ int do_signal32(sigset_t *oldset, struct pt_regs *regs)
 
        /* Whee!  Actually deliver the signal.  */
        if (ka.sa.sa_flags & SA_SIGINFO)
-               handle_rt_signal32(signr, &ka, &info, oldset, regs, newsp);
+               ret = handle_rt_signal32(signr, &ka, &info, oldset, regs, newsp);
        else
-               handle_signal32(signr, &ka, &info, oldset, regs, newsp);
+               ret = handle_signal32(signr, &ka, &info, oldset, regs, newsp);
 
-       if (!(ka.sa.sa_flags & SA_NODEFER)) {
+       if (ret && !(ka.sa.sa_flags & SA_NODEFER)) {
                spin_lock_irq(&current->sighand->siglock);
                sigorsets(&current->blocked, &current->blocked,
                          &ka.sa.sa_mask);
@@ -996,5 +1002,5 @@ int do_signal32(sigset_t *oldset, struct pt_regs *regs)
                spin_unlock_irq(&current->sighand->siglock);
        }
 
-       return 1;
+       return ret;
 }