Merge branch 'timers/urgent' of ssh://master.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into timers/urgent

2008-07-27 23:15:26 +02:00
parent e338125b8a ba661292a2
commit 2106b531ea
2 changed files with 15 additions and 5 deletions
--- a/kernel/signal.c
+++ b/kernel/signal.c
@ -1319,6 +1319,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;