Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 19420
b: refs/heads/master
c: a16ef86
h: refs/heads/master
v: v3
  • Loading branch information
Alexey Dobriyan authored and Linus Torvalds committed Feb 1, 2006
1 parent 1df4f5a commit 6f0668f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 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: 41a60ef0698394ee320813816baf221bcb533797
refs/heads/master: a16ef86c87f4b029f55fa41979134d73d1375398
3 changes: 2 additions & 1 deletion trunk/arch/arm26/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,7 @@ static int do_signal(sigset_t *oldset, struct pt_regs *regs, int syscall)
{
siginfo_t info;
int signr;
struct k_sigaction ka;

/*
* We want the common case to go fast, which
Expand All @@ -493,7 +494,7 @@ static int do_signal(sigset_t *oldset, struct pt_regs *regs, int syscall)
if (current->ptrace & PT_SINGLESTEP)
ptrace_cancel_bpt(current);

signr = get_signal_to_deliver(&info, regs, NULL);
signr = get_signal_to_deliver(&info, &ka, regs, NULL);
if (signr > 0) {
handle_signal(signr, &info, oldset, regs, syscall);
if (current->ptrace & PT_SINGLESTEP)
Expand Down

0 comments on commit 6f0668f

Please sign in to comment.