aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/signal.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-27 17:15:26 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-27 17:15:26 -0400
commit2106b531eaa2edd0c2dfa735a0556c08c7ba3c86 (patch)
tree423fcf0ac74f0dd5d88864b7bd99a1160129e064 /kernel/signal.c
parente338125b8a886923ba8367207c144764dc352584 (diff)
parentba661292a2bc6ddd305a212b0526e5dc22195fe7 (diff)
Merge branch 'timers/urgent' of ssh://master.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into timers/urgent
Diffstat (limited to 'kernel/signal.c')
-rw-r--r--kernel/signal.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/signal.c b/kernel/signal.c
index 6c0958e52ea..c5bf0c0df65 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1319,6 +1319,7 @@ int send_sigqueue(struct sigqueue *q, struct task_struct *t, int group)
1319 q->info.si_overrun++; 1319 q->info.si_overrun++;
1320 goto out; 1320 goto out;
1321 } 1321 }
1322 q->info.si_overrun = 0;
1322 1323
1323 signalfd_notify(t, sig); 1324 signalfd_notify(t, sig);
1324 pending = group ? &t->signal->shared_pending : &t->pending; 1325 pending = group ? &t->signal->shared_pending : &t->pending;