From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758184AbbDVTNF (ORCPT ); Wed, 22 Apr 2015 15:13:05 -0400 Received: from terminus.zytor.com ([198.137.202.10]:41605 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757649AbbDVTM7 (ORCPT ); Wed, 22 Apr 2015 15:12:59 -0400 Date: Wed, 22 Apr 2015 12:12:26 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: peterz@infradead.org, preeti@linux.vnet.ibm.com, mtosatti@redhat.com, tglx@linutronix.de, mingo@kernel.org, linux-kernel@vger.kernel.org, viresh.kumar@linaro.org, hpa@zytor.com, fweisbec@gmail.com Reply-To: fweisbec@gmail.com, hpa@zytor.com, viresh.kumar@linaro.org, linux-kernel@vger.kernel.org, mingo@kernel.org, mtosatti@redhat.com, tglx@linutronix.de, preeti@linux.vnet.ibm.com, peterz@infradead.org In-Reply-To: <20150414203502.907149271@linutronix.de> References: <20150414203502.907149271@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] hrtimer: Remove bogus hrtimer_active() check Git-Commit-ID: 3f7b349ac14885472a19c46840235114e5ad5e52 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: 3f7b349ac14885472a19c46840235114e5ad5e52 Gitweb: http://git.kernel.org/tip/3f7b349ac14885472a19c46840235114e5ad5e52 Author: Thomas Gleixner AuthorDate: Tue, 14 Apr 2015 21:09:11 +0000 Committer: Thomas Gleixner CommitDate: Wed, 22 Apr 2015 17:06:51 +0200 hrtimer: 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.907149271@linutronix.de Signed-off-by: Thomas Gleixner --- kernel/time/hrtimer.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index e5cf71aa..c38f0b6 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -1361,8 +1361,6 @@ static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mod do { set_current_state(TASK_INTERRUPTIBLE); hrtimer_start_expires(&t->timer, mode); - if (!hrtimer_active(&t->timer)) - t->task = NULL; if (likely(t->task)) freezable_schedule(); @@ -1633,8 +1631,6 @@ schedule_hrtimeout_range_clock(ktime_t *expires, unsigned long delta, hrtimer_init_sleeper(&t, current); hrtimer_start_expires(&t.timer, mode); - if (!hrtimer_active(&t.timer)) - t.task = NULL; if (likely(t.task)) schedule();