X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=fs%2Fsignalfd.c;h=3b07f26d984d6bc6ee35eb7bce1e834d1e594da1;hb=275391a482c436282dde57beeffc5d61b229fdd2;hp=f1da89203a9aeea3108fe9270169c501df821129;hpb=9059b454248a060ab39346c5d079f56089ab3868;p=linux-2.6-omap-h63xx.git

diff --git a/fs/signalfd.c b/fs/signalfd.c
index f1da89203a9..3b07f26d984 100644
--- a/fs/signalfd.c
+++ b/fs/signalfd.c
@@ -133,7 +133,8 @@ static unsigned int signalfd_poll(struct file *file, poll_table *wait)
 	 * the peer disconnects.
 	 */
 	if (signalfd_lock(ctx, &lk)) {
-		if (next_signal(&lk.tsk->pending, &ctx->sigmask) > 0 ||
+		if ((lk.tsk == current &&
+		     next_signal(&lk.tsk->pending, &ctx->sigmask) > 0) ||
 		    next_signal(&lk.tsk->signal->shared_pending,
 				&ctx->sigmask) > 0)
 			events |= POLLIN;