Commit 9450d14f authored Nov 27, 2013 by Will Deacon Committed by Ingo Molnar Dec 17, 2013

Revert "ARM: 7556/1: perf: fix updated event period in response to PERF_EVENT_IOC_PERIOD"



This reverts commit 3581fe0e.

Fixes to the handling of PERF_EVENT_IOC_PERIOD in the core code mean
we no longer have to play this horrible game.

Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1385560479-11014-2-git-send-email-will.deacon@arm.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent bad7192b

arch/arm/kernel/perf_event.c

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -99,10 +99,6 @@ int armpmu_event_set_period(struct perf_event *event)
	s64 period = hwc->sample_period;		s64 period = hwc->sample_period;
	int ret = 0;		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)) {		if (unlikely(left <= -period)) {
	left = period;		left = period;
	local64_set(&hwc->period_left, left);		local64_set(&hwc->period_left, left);