Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 23070
b: refs/heads/master
c: a26fd33
h: refs/heads/master
v: v3
  • Loading branch information
Oleg Nesterov authored and Linus Torvalds committed Mar 23, 2006
1 parent 1d3b2e8 commit 89d27c4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 40953ed87dd68742de0dd1bdecdcdfebfe1d69ae
refs/heads/master: a26fd335b481e0bd14f4e7d1f5e7bb1138b1731f
8 changes: 4 additions & 4 deletions trunk/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -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(&current->sighand->siglock);
old_block = current->blocked;
if (oldset)
*oldset = current->blocked;

error = 0;
switch (how) {
case SIG_BLOCK:
Expand All @@ -2121,8 +2122,7 @@ int sigprocmask(int how, sigset_t *set, sigset_t *oldset)
}
recalc_sigpending();
spin_unlock_irq(&current->sighand->siglock);
if (oldset)
*oldset = old_block;

return error;
}

Expand Down

0 comments on commit 89d27c4

Please sign in to comment.