From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758165AbbDVTLp (ORCPT ); Wed, 22 Apr 2015 15:11:45 -0400 Received: from terminus.zytor.com ([198.137.202.10]:41529 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757643AbbDVTLi (ORCPT ); Wed, 22 Apr 2015 15:11:38 -0400 Date: Wed, 22 Apr 2015 12:11:03 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: fweisbec@gmail.com, preeti@linux.vnet.ibm.com, peterz@infradead.org, tglx@linutronix.de, viresh.kumar@linaro.org, mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, mtosatti@redhat.com Reply-To: fweisbec@gmail.com, preeti@linux.vnet.ibm.com, peterz@infradead.org, tglx@linutronix.de, mingo@kernel.org, viresh.kumar@linaro.org, hpa@zytor.com, linux-kernel@vger.kernel.org, mtosatti@redhat.com In-Reply-To: <20150414203502.452104213@linutronix.de> References: <20150414203502.452104213@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] perf: core: Use hrtimer_start() Git-Commit-ID: 3497d206c4d9b266d2e56c8b20e51b2f0e6a3c72 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: 3497d206c4d9b266d2e56c8b20e51b2f0e6a3c72 Gitweb: http://git.kernel.org/tip/3497d206c4d9b266d2e56c8b20e51b2f0e6a3c72 Author: Thomas Gleixner AuthorDate: Tue, 14 Apr 2015 21:09:03 +0000 Committer: Thomas Gleixner CommitDate: Wed, 22 Apr 2015 17:06:51 +0200 perf: core: Use hrtimer_start() hrtimer_start() does not longer defer already expired timers to the softirq. Get rid of the __hrtimer_start_range_ns() invocation. 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.452104213@linutronix.de Signed-off-by: Thomas Gleixner --- kernel/events/core.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 81aa3a4..05309fd 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -834,9 +834,7 @@ static void perf_cpu_hrtimer_restart(struct perf_cpu_context *cpuctx) if (hrtimer_active(hr)) return; - if (!hrtimer_callback_running(hr)) - __hrtimer_start_range_ns(hr, cpuctx->hrtimer_interval, - 0, HRTIMER_MODE_REL_PINNED, 0); + hrtimer_start(hr, cpuctx->hrtimer_interval, HRTIMER_MODE_REL_PINNED); } void perf_pmu_disable(struct pmu *pmu) @@ -6843,9 +6841,8 @@ static void perf_swevent_start_hrtimer(struct perf_event *event) } else { period = max_t(u64, 10000, hwc->sample_period); } - __hrtimer_start_range_ns(&hwc->hrtimer, - ns_to_ktime(period), 0, - HRTIMER_MODE_REL_PINNED, 0); + hrtimer_start(&hwc->hrtimer, ns_to_ktime(period), + HRTIMER_MODE_REL_PINNED); } static void perf_swevent_cancel_hrtimer(struct perf_event *event)