diff options
| author | Oleg Nesterov <oleg@tv-sign.ru> | 2006-03-23 12:00:49 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-23 16:38:15 +0100 |
| commit | a26fd335b481e0bd14f4e7d1f5e7bb1138b1731f (patch) | |
| tree | 5578fdb48025e7e2b54fb02c8c877858ad3e859a | |
| parent | [PATCH] snsc kmalloc2kzalloc (diff) | |
| download | linux-a26fd335b481e0bd14f4e7d1f5e7bb1138b1731f.tar.xz linux-a26fd335b481e0bd14f4e7d1f5e7bb1138b1731f.zip | |
[PATCH] sigprocmask: kill unneeded temp var
Cleanup, remove unneeded double copying of current->blocked.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | kernel/signal.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index dfb09ba5c013..75f7341b0c39 100644 --- a/kernel/signal.c +++ b/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; } |