From: Al Viro Date: Thu, 18 Aug 2011 19:00:19 +0000 (+0100) Subject: um: switch {rt_,}sigreturn() to set_current_blocked() X-Git-Tag: v3.2-rc1~87^2~88 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=78722a445bb253fa6bcbe9d6589f27db78056af6;p=profile%2Fivi%2Fkernel-x86-ivi.git um: switch {rt_,}sigreturn() to set_current_blocked() same story as on x86 native... Signed-off-by: Al Viro Signed-off-by: Richard Weinberger --- diff --git a/arch/um/sys-i386/signal.c b/arch/um/sys-i386/signal.c index 89a4662..4403b48 100644 --- a/arch/um/sys-i386/signal.c +++ b/arch/um/sys-i386/signal.c @@ -458,11 +458,7 @@ long sys_sigreturn(struct pt_regs regs) goto segfault; sigdelsetmask(&set, ~_BLOCKABLE); - - spin_lock_irq(¤t->sighand->siglock); - current->blocked = set; - recalc_sigpending(); - spin_unlock_irq(¤t->sighand->siglock); + set_current_blocked(&set); if (copy_sc_from_user(¤t->thread.regs, sc)) goto segfault; @@ -489,11 +485,7 @@ long sys_rt_sigreturn(struct pt_regs regs) goto segfault; sigdelsetmask(&set, ~_BLOCKABLE); - - spin_lock_irq(¤t->sighand->siglock); - current->blocked = set; - recalc_sigpending(); - spin_unlock_irq(¤t->sighand->siglock); + set_current_blocked(&set); if (copy_sc_from_user(¤t->thread.regs, &uc->uc_mcontext)) goto segfault; diff --git a/arch/um/sys-x86_64/signal.c b/arch/um/sys-x86_64/signal.c index b6b65c7..581b64d 100644 --- a/arch/um/sys-x86_64/signal.c +++ b/arch/um/sys-x86_64/signal.c @@ -270,11 +270,7 @@ long sys_rt_sigreturn(struct pt_regs *regs) goto segfault; sigdelsetmask(&set, ~_BLOCKABLE); - - spin_lock_irq(¤t->sighand->siglock); - current->blocked = set; - recalc_sigpending(); - spin_unlock_irq(¤t->sighand->siglock); + set_current_blocked(&set); if (copy_sc_from_user(¤t->thread.regs, &uc->uc_mcontext, &frame->fpstate))