summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2010-01-27 23:07:49 +0100
committerIngo Molnar <mingo@elte.hu>2010-01-29 09:01:49 +0100
commit18c01f8abff51e4910cc5ffb4b710e8c6eea60c9 (patch)
tree0d1430eeb579c21365db515c89edbf8871e1ecd7
parent452a339a976e7f782c786eb3f73080401e2fa3a6 (diff)
downloadlinux-3.10-18c01f8abff51e4910cc5ffb4b710e8c6eea60c9.tar.gz
linux-3.10-18c01f8abff51e4910cc5ffb4b710e8c6eea60c9.tar.bz2
linux-3.10-18c01f8abff51e4910cc5ffb4b710e8c6eea60c9.zip
perf_events, x86: Remove spurious counter reset from x86_pmu_enable()
At enable time the counter might still have a ->idx pointing to a previously occupied location that might now be taken by another event. Resetting the counter at that location with data from this event will destroy the other counter's count. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Stephane Eranian <eranian@google.com> LKML-Reference: <20100127221122.261477183@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/cpu/perf_event.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index 3fac0bfc2de..518eb3e3957 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -1762,9 +1762,6 @@ static int x86_pmu_enable(struct perf_event *event)
cpuc->n_events = n;
cpuc->n_added = n - n0;
- if (hwc->idx != -1)
- x86_perf_event_set_period(event, hwc, hwc->idx);
-
return 0;
}