Commit-ID: ccdd92c17e144c8494f4c94ab85b48d297545cec Gitweb: http://git.kernel.org/tip/ccdd92c17e144c8494f4c94ab85b48d297545cec Author: Thomas Gleixner <t...@linutronix.de> AuthorDate: Tue, 14 Apr 2015 21:09:15 +0000 Committer: Thomas Gleixner <t...@linutronix.de> CommitDate: Wed, 22 Apr 2015 17:06:51 +0200
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 <t...@linutronix.de> Acked-by: Peter Zijlstra <pet...@infradead.org> Cc: Preeti U Murthy <pre...@linux.vnet.ibm.com> Cc: Viresh Kumar <viresh.ku...@linaro.org> Cc: Marcelo Tosatti <mtosa...@redhat.com> Cc: Frederic Weisbecker <fweis...@gmail.com> Link: http://lkml.kernel.org/r/20150414203503.081830...@linutronix.de Signed-off-by: Thomas Gleixner <t...@linutronix.de> --- kernel/locking/rtmutex.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c index b732793..8626437 100644 --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c @@ -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); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/