Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 292610
b: refs/heads/master
c: ff6d21e
h: refs/heads/master
v: v3
  • Loading branch information
Matt Fleming authored and Linus Torvalds committed Mar 22, 2012
1 parent ca8acb2 commit bf219a6
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 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: fa47ac59020e91082386f65a01f3e8cc6116ef95
refs/heads/master: ff6d21e7aafe3cf4b20697f67e656caa4daef40b
3 changes: 0 additions & 3 deletions trunk/arch/xtensa/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -536,9 +536,6 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset)
/* Set up the stack frame */
setup_frame(signr, &ka, &info, oldset, regs);

if (ka.sa.sa_flags & SA_ONESHOT)
ka.sa.sa_handler = SIG_DFL;

spin_lock_irq(&current->sighand->siglock);
sigorsets(&current->blocked, &current->blocked, &ka.sa.sa_mask);
if (!(ka.sa.sa_flags & SA_NODEFER))
Expand Down

0 comments on commit bf219a6

Please sign in to comment.