Merge remote-tracking branch 'ptrace/ptrace'

diff --cc arch/mips/kernel/signal.c
Simple merge

diff --cc arch/openrisc/kernel/signal.c
Simple merge

diff --cc arch/s390/kernel/compat_signal.c
Simple merge

diff --cc arch/s390/kernel/signal.c
Simple merge

diff --cc arch/sparc/kernel/signal32.c
Simple merge

diff --cc arch/sparc/kernel/signal_32.c
index 04ede8f04add3f397ca46c8ebee249d85c92213c,f6b0faba399bdc52991d4c883937475d6b735e32..f1f8a03664bc1ff8661498c3bf08d4b11b4b7bd5
--- 1/arch/sparc/kernel/signal_32.c
--- 2/arch/sparc/kernel/signal_32.c
+++ b/arch/sparc/kernel/signal_32.c
@@@ -202,17 -226,8 +200,14 @@@ asmlinkage void do_rt_sigreturn(struct 
        do_sigaltstack((const stack_t __user *) &st, NULL, (unsigned long)sf);
        set_fs(old_fs);
  
 +      err |= __get_user(rwin_save, &sf->rwin_save);
 +      if (!err && rwin_save) {
 +              if (restore_rwin_state(rwin_save))
 +                      goto segv;
 +      }
 +
        sigdelsetmask(&set, ~_BLOCKABLE);
-       spin_lock_irq(&current->sighand->siglock);
-       current->blocked = set;
-       recalc_sigpending();
-       spin_unlock_irq(&current->sighand->siglock);
+       set_current_blocked(&set);
        return;
  segv:
        force_sig(SIGSEGV, current);

diff --cc arch/sparc/kernel/signal_64.c
Simple merge

diff --cc include/linux/sched.h
Simple merge