diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-02 11:37:07 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-02 11:37:07 -0600 |
| commit | 3154da34beff952a6b29dcc27c9dacf9adac977c (patch) | |
| tree | 9bb7133d2e429611761d63b6b7dc52e3e59fc5df /arch/x86/kernel | |
| parent | 55de1ed2f597646c6c7f0bbe2da1680c760b0d40 (diff) | |
| parent | af76815a31adc75dd9526230affdd678e65ac59f (diff) | |
| download | op-kernel-dev-3154da34beff952a6b29dcc27c9dacf9adac977c.zip op-kernel-dev-3154da34beff952a6b29dcc27c9dacf9adac977c.tar.gz | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"Misc fixes, most of them on the tooling side"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf tools: Fix strict alias issue for find_first_bit
perf tools: fix BFD detection on opensuse
perf: Fix hotplug splat
perf/x86: Fix event scheduling
perf symbols: Destroy unused symsrcs
perf annotate: Check availability of annotate when processing samples
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/cpu/perf_event.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index 895604f..79f9f84 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c @@ -1192,6 +1192,9 @@ static void x86_pmu_del(struct perf_event *event, int flags) for (i = 0; i < cpuc->n_events; i++) { if (event == cpuc->event_list[i]) { + if (i >= cpuc->n_events - cpuc->n_added) + --cpuc->n_added; + if (x86_pmu.put_event_constraints) x86_pmu.put_event_constraints(cpuc, event); |
