From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 21 Sep 2011 03:57:03 +0000 (+1000)
Subject: Merge remote-tracking branch 'ptrace/ptrace'
X-Git-Tag: next-20110921~17
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=85d91ebc9d7f950b0482dad28eb32c01cca222b0;p=karo-tx-linux.git

Merge remote-tracking branch 'ptrace/ptrace'
---

85d91ebc9d7f950b0482dad28eb32c01cca222b0
diff --cc arch/sparc/kernel/signal_32.c
index 04ede8f04add,f6b0faba399b..f1f8a03664bc
--- a/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);