From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934510AbbDVTNn (ORCPT ); Wed, 22 Apr 2015 15:13:43 -0400 Received: from terminus.zytor.com ([198.137.202.10]:41668 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932114AbbDVTNg (ORCPT ); Wed, 22 Apr 2015 15:13:36 -0400 Date: Wed, 22 Apr 2015 12:13:00 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: linux-kernel@vger.kernel.org, mingo@kernel.org, viresh.kumar@linaro.org, tglx@linutronix.de, fweisbec@gmail.com, mtosatti@redhat.com, hpa@zytor.com, peterz@infradead.org, preeti@linux.vnet.ibm.com Reply-To: fweisbec@gmail.com, hpa@zytor.com, mtosatti@redhat.com, preeti@linux.vnet.ibm.com, peterz@infradead.org, linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de, viresh.kumar@linaro.org In-Reply-To: <20150414203503.081830481@linutronix.de> References: <20150414203503.081830481@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] rtmutex: Remove bogus hrtimer_active() check Git-Commit-ID: ccdd92c17e144c8494f4c94ab85b48d297545cec X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: ccdd92c17e144c8494f4c94ab85b48d297545cec Gitweb: http://git.kernel.org/tip/ccdd92c17e144c8494f4c94ab85b48d297545cec Author: Thomas Gleixner AuthorDate: Tue, 14 Apr 2015 21:09:15 +0000 Committer: Thomas Gleixner 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 Acked-by: Peter Zijlstra Cc: Preeti U Murthy Cc: Viresh Kumar Cc: Marcelo Tosatti Cc: Frederic Weisbecker Link: http://lkml.kernel.org/r/20150414203503.081830481@linutronix.de Signed-off-by: Thomas Gleixner --- 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);