aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-05-21 23:42:15 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-06-01 12:58:49 -0400
commita610d6e672d6d3723e8da257ad4a8a288a8f2f89 (patch)
tree2fac6ce7f72756771f4f87583205cc402589dcad /arch/powerpc/kernel
parent5754f412a3f107cbcd93ee125bef296f2a07539b (diff)
pull clearing RESTORE_SIGMASK into block_sigmask()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r--arch/powerpc/kernel/signal.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c
index 8e9ddab7ade6..d926d2e4611a 100644
--- a/arch/powerpc/kernel/signal.c
+++ b/arch/powerpc/kernel/signal.c
@@ -159,13 +159,6 @@ static int do_signal(struct pt_regs *regs)
159 regs->trap = 0; 159 regs->trap = 0;
160 if (ret) { 160 if (ret) {
161 block_sigmask(&ka, signr); 161 block_sigmask(&ka, signr);
162
163 /*
164 * A signal was successfully delivered; the saved sigmask is in
165 * its frame, and we can clear the TLF_RESTORE_SIGMASK flag.
166 */
167 current_thread_info()->local_flags &= ~_TLF_RESTORE_SIGMASK;
168
169 /* 162 /*
170 * Let tracing know that we've done the handler setup. 163 * Let tracing know that we've done the handler setup.
171 */ 164 */