X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=kernel%2Ffutex.c;h=ea6ca0bca52570b8cd88a9c428016cd54cf55a0a;hb=3a95398f54cbd664c749fe9f1bfc7e7dbace92d0;hp=aacc706f85fcc1d7a1e8dd6c4e753c5b3495e1b0;hpb=5ef6ca4f24b59af7f7c2c19502a3923a4bc10e0a;p=firefly-linux-kernel-4.4.55.git

diff --git a/kernel/futex.c b/kernel/futex.c
index aacc706f85fc..ea6ca0bca525 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -2064,11 +2064,8 @@ static void futex_wait_queue_me(struct futex_hash_bucket *hb, struct futex_q *q,
 	queue_me(q, hb);
 
 	/* Arm the timer */
-	if (timeout) {
+	if (timeout)
 		hrtimer_start_expires(&timeout->timer, HRTIMER_MODE_ABS);
-		if (!hrtimer_active(&timeout->timer))
-			timeout->task = NULL;
-	}
 
 	/*
 	 * If we have been removed from the hash list, then another task