diff --git a/kernel/exit.c b/kernel/exit.c
index 9c6881a0a8b4..dd83c8419101 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1595,9 +1595,7 @@ repeat:
 
 		if (wo->wo_flags & __WNOTHREAD)
 			break;
-		tsk = next_thread(tsk);
-		BUG_ON(tsk->signal != current->signal);
-	} while (tsk != current);
+	} while_each_thread(current, tsk);
 	read_unlock(&tasklist_lock);
 
 notask: