Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[linux-2.6-block.git] / kernel / signal.c

diff --git a/kernel/signal.c b/kernel/signal.c
index 01c4c46a51a82b87c6d70eaf43a4baded87e567b..1f9dd41c04be2202309acbd00c051651e739daf1 100644 (file)
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1375,9 +1375,7 @@ int zap_other_threads(struct task_struct *p)
 
        for_other_threads(p, t) {
                task_clear_jobctl_pending(t, JOBCTL_PENDING_MASK);
-               /* Don't require de_thread to wait for the vhost_worker */
-               if ((t->flags & (PF_IO_WORKER | PF_USER_WORKER)) != PF_USER_WORKER)
-                       count++;
+               count++;
 
                /* Don't bother with already dead threads */
                if (t->exit_state)