From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934457AbbDVTNX (ORCPT ); Wed, 22 Apr 2015 15:13:23 -0400 Received: from terminus.zytor.com ([198.137.202.10]:41625 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932114AbbDVTNS (ORCPT ); Wed, 22 Apr 2015 15:13:18 -0400 Date: Wed, 22 Apr 2015 12:12:43 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: viresh.kumar@linaro.org, fweisbec@gmail.com, hpa@zytor.com, mtosatti@redhat.com, preeti@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, mingo@kernel.org, peterz@infradead.org, tglx@linutronix.de Reply-To: tglx@linutronix.de, mingo@kernel.org, linux-kernel@vger.kernel.org, peterz@infradead.org, fweisbec@gmail.com, viresh.kumar@linaro.org, hpa@zytor.com, mtosatti@redhat.com, preeti@linux.vnet.ibm.com In-Reply-To: <20150414203502.985825453@linutronix.de> References: <20150414203502.985825453@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] futex: Remove bogus hrtimer_active() check Git-Commit-ID: 2e4b0d3fe88bc2618fd5d081ace338a70f8c23da 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: 2e4b0d3fe88bc2618fd5d081ace338a70f8c23da Gitweb: http://git.kernel.org/tip/2e4b0d3fe88bc2618fd5d081ace338a70f8c23da Author: Thomas Gleixner AuthorDate: Tue, 14 Apr 2015 21:09:13 +0000 Committer: Thomas Gleixner CommitDate: Wed, 22 Apr 2015 17:06:51 +0200 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 Acked-by: Peter Zijlstra Cc: Preeti U Murthy Cc: Viresh Kumar Cc: Marcelo Tosatti Cc: Frederic Weisbecker Link: http://lkml.kernel.org/r/20150414203502.985825453@linutronix.de Signed-off-by: Thomas Gleixner --- kernel/futex.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kernel/futex.c b/kernel/futex.c index 2579e40..720eacf 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -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