diff -r cc6ba96a04e0 sys/kern/sys_futex.c
--- a/sys/kern/sys_futex.c	Thu May 21 05:56:31 2020 +0000
+++ b/sys/kern/sys_futex.c	Thu May 21 16:17:22 2020 +0000
@@ -1008,10 +1008,10 @@ futex_wake(struct futex *f, unsigned nwa
 	KASSERT(f2 == NULL || mutex_owned(&f2->fx_qlock));
 
 	/* Wake up to nwake waiters, and count the number woken.  */
-	TAILQ_FOREACH_SAFE(fw, &f->fx_queue, fw_entry, fw_next) {
-		if ((fw->fw_bitset & bitset) == 0)
-			continue;
-		if (nwake > 0) {
+	if (nwake) {
+		TAILQ_FOREACH_SAFE(fw, &f->fx_queue, fw_entry, fw_next) {
+			if ((fw->fw_bitset & bitset) == 0)
+				continue;
 			mutex_enter(&fw->fw_lock);
 			if (__predict_false(fw->fw_aborting)) {
 				mutex_exit(&fw->fw_lock);
@@ -1030,43 +1030,41 @@ futex_wake(struct futex *f, unsigned nwa
 			 * also have one).
 			 */
 			futex_rele_not_last(f);
-		} else {
-			break;
+			if (nwake == 0)
+				break;
 		}
 	}
 
-	if (f2) {
+	if (f2 == NULL) {
+		KASSERT(nreqeuue == 0);
+	} else if (nrequeue) {
 		/* Move up to nrequeue waiters from f's queue to f2's queue. */
 		TAILQ_FOREACH_SAFE(fw, &f->fx_queue, fw_entry, fw_next) {
 			if ((fw->fw_bitset & bitset) == 0)
 				continue;
-			if (nrequeue > 0) {
-				mutex_enter(&fw->fw_lock);
-				if (__predict_false(fw->fw_aborting)) {
-					mutex_exit(&fw->fw_lock);
-					continue;
-				}
-				futex_wait_dequeue(fw, f);
-				futex_wait_enqueue(fw, f2);
+			mutex_enter(&fw->fw_lock);
+			if (__predict_false(fw->fw_aborting)) {
 				mutex_exit(&fw->fw_lock);
-				nrequeue--;
-				/*
-				 * Transfer the reference from f to f2.
-				 * As above, we assert that we are not
-				 * dropping the last reference to f here.
-				 *
-				 * XXX futex_hold() could theoretically
-				 * XXX fail here.
-				 */
-				futex_rele_not_last(f);
-				hold_error = futex_hold(f2);
-				KASSERT(hold_error == 0);
-			} else {
+				continue;
+			}
+			futex_wait_dequeue(fw, f);
+			futex_wait_enqueue(fw, f2);
+			mutex_exit(&fw->fw_lock);
+			nrequeue--;
+			/*
+			 * Transfer the reference from f to f2.  As
+			 * above, we assert that we are not dropping
+			 * the last reference to f here.
+			 *
+			 * XXX futex_hold() could theoretically fail
+			 * here.
+			 */
+			futex_rele_not_last(f);
+			hold_error = futex_hold(f2);
+			KASSERT(hold_error == 0);
+			if (nrequeue == 0)
 				break;
-			}
 		}
-	} else {
-		KASSERT(nrequeue == 0);
 	}
 
 	/* Return the number of waiters woken.  */