diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-04-27 14:09:19 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-06-01 12:58:51 -0400 |
commit | 17440f171e28e86cc21a4c8fd1fa3c561503f80e (patch) | |
tree | 0962e102694fec3a97b5d2454b3ad9cc4b29ac4d /arch/powerpc/kernel/signal_64.c | |
parent | 77097ae503b170120ab66dd1d547f8577193f91f (diff) |
powerpc: get rid of restore_sigmask()
... it's just a call of set_current_blocked() now
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/powerpc/kernel/signal_64.c')
-rw-r--r-- | arch/powerpc/kernel/signal_64.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c index 2692efdb154e..d183f8719a50 100644 --- a/arch/powerpc/kernel/signal_64.c +++ b/arch/powerpc/kernel/signal_64.c | |||
@@ -335,7 +335,7 @@ int sys_swapcontext(struct ucontext __user *old_ctx, | |||
335 | 335 | ||
336 | if (__copy_from_user(&set, &new_ctx->uc_sigmask, sizeof(set))) | 336 | if (__copy_from_user(&set, &new_ctx->uc_sigmask, sizeof(set))) |
337 | do_exit(SIGSEGV); | 337 | do_exit(SIGSEGV); |
338 | restore_sigmask(&set); | 338 | set_current_blocked(&set); |
339 | if (restore_sigcontext(regs, NULL, 0, &new_ctx->uc_mcontext)) | 339 | if (restore_sigcontext(regs, NULL, 0, &new_ctx->uc_mcontext)) |
340 | do_exit(SIGSEGV); | 340 | do_exit(SIGSEGV); |
341 | 341 | ||
@@ -364,7 +364,7 @@ int sys_rt_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5, | |||
364 | 364 | ||
365 | if (__copy_from_user(&set, &uc->uc_sigmask, sizeof(set))) | 365 | if (__copy_from_user(&set, &uc->uc_sigmask, sizeof(set))) |
366 | goto badframe; | 366 | goto badframe; |
367 | restore_sigmask(&set); | 367 | set_current_blocked(&set); |
368 | if (restore_sigcontext(regs, NULL, 1, &uc->uc_mcontext)) | 368 | if (restore_sigcontext(regs, NULL, 1, &uc->uc_mcontext)) |
369 | goto badframe; | 369 | goto badframe; |
370 | 370 | ||