diff --git a/[refs] b/[refs] index 9396596179e5..d0c648fc9fb6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 40953ed87dd68742de0dd1bdecdcdfebfe1d69ae +refs/heads/master: a26fd335b481e0bd14f4e7d1f5e7bb1138b1731f diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c index dfb09ba5c013..75f7341b0c39 100644 --- a/trunk/kernel/signal.c +++ b/trunk/kernel/signal.c @@ -2101,10 +2101,11 @@ long do_no_restart_syscall(struct restart_block *param) int sigprocmask(int how, sigset_t *set, sigset_t *oldset) { int error; - sigset_t old_block; spin_lock_irq(¤t->sighand->siglock); - old_block = current->blocked; + if (oldset) + *oldset = current->blocked; + error = 0; switch (how) { case SIG_BLOCK: @@ -2121,8 +2122,7 @@ int sigprocmask(int how, sigset_t *set, sigset_t *oldset) } recalc_sigpending(); spin_unlock_irq(¤t->sighand->siglock); - if (oldset) - *oldset = old_block; + return error; }