diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-12 01:46:11 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-12 01:46:11 +0200 |
| commit | 67a077dca4e648a662e32cbeaaba8094d2e30229 (patch) | |
| tree | 2f8943838b73b0a8ea590b1aaad9294eb280ea1e /kernel/signal.c | |
| parent | Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | Merge branch 'timers/urgent' of ssh://master.kernel.org/pub/scm/linux/kernel/... (diff) | |
| download | linux-67a077dca4e648a662e32cbeaaba8094d2e30229.tar.xz linux-67a077dca4e648a662e32cbeaaba8094d2e30229.zip | |
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
posix-timers: fix posix_timer_event() vs dequeue_signal() race
posix-timers: do_schedule_next_timer: fix the setting of ->si_overrun
Diffstat (limited to 'kernel/signal.c')
| -rw-r--r-- | kernel/signal.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index 954f77d7e3bc..c539f60c6f41 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -1304,6 +1304,7 @@ int send_sigqueue(struct sigqueue *q, struct task_struct *t, int group) q->info.si_overrun++; goto out; } + q->info.si_overrun = 0; signalfd_notify(t, sig); pending = group ? &t->signal->shared_pending : &t->pending; |