Commit ccdd92c1 authored Apr 14, 2015 by Thomas Gleixner

rtmutex: 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/20150414203503.081830481@linutronix.de


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

parent 2e4b0d3f

kernel/locking/rtmutex.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -1180,11 +1180,8 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state,
		set_current_state(state);

		/* Setup the timer, when timeout != NULL */
		if (unlikely(timeout)) {
		if (unlikely(timeout))
		hrtimer_start_expires(&timeout->timer, HRTIMER_MODE_ABS);
		if (!hrtimer_active(&timeout->timer))
		timeout->task = NULL;
		}

		ret = task_blocks_on_rt_mutex(lock, &waiter, current, chwalk);