Commit 2e4b0d3f authored Apr 14, 2015 by Thomas Gleixner

futex: Remove bogus hrtimer_active() check



The check for hrtimer_active() after starting the timer is
pointless. If the timer is inactive it has expired already and
therefor the task pointer is already NULL.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Cc: Preeti U Murthy <preeti@linux.vnet.ibm.com>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Link: http://lkml.kernel.org/r/20150414203502.985825453@linutronix.de


Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent 3f7b349a

kernel/futex.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -2063,11 +2063,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