From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934539AbbDVTNz (ORCPT ); Wed, 22 Apr 2015 15:13:55 -0400 Received: from terminus.zytor.com ([198.137.202.10]:41682 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932114AbbDVTNv (ORCPT ); Wed, 22 Apr 2015 15:13:51 -0400 Date: Wed, 22 Apr 2015 12:13:16 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: tglx@linutronix.de, davem@davemloft.net, hpa@zytor.com, preeti@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, fweisbec@gmail.com, viresh.kumar@linaro.org, mtosatti@redhat.com, mingo@kernel.org, peterz@infradead.org Reply-To: linux-kernel@vger.kernel.org, fweisbec@gmail.com, mingo@kernel.org, viresh.kumar@linaro.org, mtosatti@redhat.com, peterz@infradead.org, tglx@linutronix.de, davem@davemloft.net, hpa@zytor.com, preeti@linux.vnet.ibm.com In-Reply-To: <20150414203503.165258315@linutronix.de> References: <20150414203503.165258315@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] net: core: pktgen: Remove bogus hrtimer_active( ) check Git-Commit-ID: 46ac2f53dfe93a25b251696b946af7b673978ccb 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: 46ac2f53dfe93a25b251696b946af7b673978ccb Gitweb: http://git.kernel.org/tip/46ac2f53dfe93a25b251696b946af7b673978ccb Author: Thomas Gleixner AuthorDate: Tue, 14 Apr 2015 21:09:16 +0000 Committer: Thomas Gleixner CommitDate: Wed, 22 Apr 2015 17:06:52 +0200 net: core: pktgen: 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 Acked-by: David S. Miller Link: http://lkml.kernel.org/r/20150414203503.165258315@linutronix.de Signed-off-by: Thomas Gleixner --- net/core/pktgen.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 508155b..54817d3 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -2212,8 +2212,6 @@ static void spin(struct pktgen_dev *pkt_dev, ktime_t spin_until) do { set_current_state(TASK_INTERRUPTIBLE); hrtimer_start_expires(&t.timer, HRTIMER_MODE_ABS); - if (!hrtimer_active(&t.timer)) - t.task = NULL; if (likely(t.task)) schedule();