From: Will Deacon <will.deacon@arm.com>
To: linux-kernel@vger.kernel.org
Cc: Will Deacon <will.deacon@arm.com>, Peter Zijlstra <peterz@infradead.org>
Subject: [PATCH 2/2] Revert "ARM: 7556/1: perf: fix updated event period in response to PERF_EVENT_IOC_PERIOD"
Date: Wed, 27 Nov 2013 13:54:39 +0000 [thread overview]
Message-ID: <1385560479-11014-2-git-send-email-will.deacon@arm.com> (raw)
In-Reply-To: <1385560479-11014-1-git-send-email-will.deacon@arm.com>
This reverts commit 3581fe0ef37ce12ac7a4f74831168352ae848edc.
Updates to the handling of PERF_EVENT_IOC_PERIOD in the core code mean
we no longer have to play this horrible game.
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
arch/arm/kernel/perf_event.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c
index bc3f2efa0d86..789d846a9184 100644
--- a/arch/arm/kernel/perf_event.c
+++ b/arch/arm/kernel/perf_event.c
@@ -99,10 +99,6 @@ int armpmu_event_set_period(struct perf_event *event)
s64 period = hwc->sample_period;
int ret = 0;
- /* The period may have been changed by PERF_EVENT_IOC_PERIOD */
- if (unlikely(period != hwc->last_period))
- left = period - (hwc->last_period - left);
-
if (unlikely(left <= -period)) {
left = period;
local64_set(&hwc->period_left, left);
--
1.8.2.2
next prev parent reply other threads:[~2013-11-27 13:55 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-27 13:54 [PATCH 1/2] perf: fix PERF_EVENT_IOC_PERIOD to force-reset the period Will Deacon
2013-11-27 13:54 ` Will Deacon [this message]
2013-12-18 10:32 ` [tip:perf/core] Revert "ARM: 7556/1: perf: fix updated event period in response to PERF_EVENT_IOC_PERIOD" tip-bot for Will Deacon
2013-11-27 15:15 ` [PATCH 1/2] perf: fix PERF_EVENT_IOC_PERIOD to force-reset the period Vince Weaver
2013-12-12 18:27 ` Will Deacon
2013-12-13 15:13 ` Peter Zijlstra
2013-12-18 10:32 ` [tip:perf/core] perf: Fix " tip-bot for Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1385560479-11014-2-git-send-email-will.deacon@arm.com \
--to=will.deacon@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome