diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-12-19 12:03:58 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-12-19 12:03:58 +0800 |
| commit | 28610abf4a574c33ca70e3d7b0e523fdede488d1 (patch) | |
| tree | 5b71eaa5fef96701ed53c5830fb0d299d589f36f /arch/x86/events/intel/ds.c | |
| parent | 56c3829d86a8dc060b591b4e841e0e721b6f9518 (diff) | |
| parent | 0c37397b6b8708f3cae24a8faeed2d1c84760892 (diff) | |
Merge remote-tracking branch 'rt-stable/v4.9-rt' into linux-linaro-lsk-v4.9-rt
Diffstat (limited to 'arch/x86/events/intel/ds.c')
| -rw-r--r-- | arch/x86/events/intel/ds.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/events/intel/ds.c b/arch/x86/events/intel/ds.c index be202390bbd3..9dfeeeca0ea8 100644 --- a/arch/x86/events/intel/ds.c +++ b/arch/x86/events/intel/ds.c @@ -1389,9 +1389,13 @@ static void intel_pmu_drain_pebs_nhm(struct pt_regs *iregs) continue; /* log dropped samples number */ - if (error[bit]) + if (error[bit]) { perf_log_lost_samples(event, error[bit]); + if (perf_event_account_interrupt(event)) + x86_pmu_stop(event, 0); + } + if (counts[bit]) { __intel_pmu_pebs_event(event, iregs, base, top, bit, counts[bit]); |