diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-06-08 02:24:07 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-06-08 02:24:07 -0400 |
| commit | a292241cccb7e20e8b997a9a44177e7c98141859 (patch) | |
| tree | a0b0bb95e7dce3233a2d8b203f9e326cdec7a00e /tools/perf/builtin-inject.c | |
| parent | d49cb7aeebb974713f9f7ab2991352d3050b095b (diff) | |
| parent | 68807a0c2015cb40df4869e16651f0ce5cc14d52 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 3.16.
Diffstat (limited to 'tools/perf/builtin-inject.c')
| -rw-r--r-- | tools/perf/builtin-inject.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c index b3466018bbd7..3a7387551369 100644 --- a/tools/perf/builtin-inject.c +++ b/tools/perf/builtin-inject.c | |||
| @@ -312,7 +312,6 @@ found: | |||
| 312 | sample_sw.period = sample->period; | 312 | sample_sw.period = sample->period; |
| 313 | sample_sw.time = sample->time; | 313 | sample_sw.time = sample->time; |
| 314 | perf_event__synthesize_sample(event_sw, evsel->attr.sample_type, | 314 | perf_event__synthesize_sample(event_sw, evsel->attr.sample_type, |
| 315 | evsel->attr.sample_regs_user, | ||
| 316 | evsel->attr.read_format, &sample_sw, | 315 | evsel->attr.read_format, &sample_sw, |
| 317 | false); | 316 | false); |
| 318 | build_id__mark_dso_hit(tool, event_sw, &sample_sw, evsel, machine); | 317 | build_id__mark_dso_hit(tool, event_sw, &sample_sw, evsel, machine); |