Merge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6

1 files changed, 10 insertions, 8 deletions

diff --git a/arch/sparc/kernel/signal32.c b/arch/sparc/kernel/signal32.c
index 2caa556db86d..023b8860dc97 100644
--- a/arch/sparc/kernel/signal32.c
+++ b/arch/sparc/kernel/signal32.c
@@ -822,21 +822,23 @@ static inline void syscall_restart32(unsigned long orig_i0, struct pt_regs *regs
  * want to handle. Thus you cannot kill init even with a SIGKILL even by
  * mistake.
  */
-void do_signal32(sigset_t *oldset, struct pt_regs * regs,
-                 int restart_syscall, unsigned long orig_i0)
+void do_signal32(sigset_t *oldset, struct pt_regs * regs)
 {
         struct k_sigaction ka;
+        unsigned long orig_i0;
+        int restart_syscall;
         siginfo_t info;
         int signr;
         
         signr = get_signal_to_deliver(&info, &ka, regs, NULL);
 
-        /* If the debugger messes with the program counter, it clears
-         * the "in syscall" bit, directing us to not perform a syscall
-         * restart.
-         */
-        if (restart_syscall && !pt_regs_is_syscall(regs))
-                restart_syscall = 0;
+        restart_syscall = 0;
+        orig_i0 = 0;
+        if (pt_regs_is_syscall(regs) &&
+            (regs->tstate & (TSTATE_XCARRY | TSTATE_ICARRY))) {
+                restart_syscall = 1;
+                orig_i0 = regs->u_regs[UREG_G6];
+        }
 
         if (signr > 0) {
                 if (restart_syscall)