diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2021-04-08 10:22:14 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2021-04-08 10:22:14 +0300 |
| commit | d527353e4bceae6d59606ad21ad00916401d22ad (patch) | |
| tree | 8ad569177aa89f15dcc485ee31d671cc98344ba8 /tools/perf/tests/sample-parsing.c | |
| parent | 70bfb30743d5da73058b0a2271e9c127a84fb494 (diff) | |
| parent | 9c0fed84d5750e1eea6c664e073ffa2534a17743 (diff) | |
Merge drm/drm-next into drm-intel-next
Sync up with topic/i915-gem-next and drm-intel-gt-next.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'tools/perf/tests/sample-parsing.c')
| -rw-r--r-- | tools/perf/tests/sample-parsing.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tools/perf/tests/sample-parsing.c b/tools/perf/tests/sample-parsing.c index 0dbe3aa99853..8fd8a4ef97da 100644 --- a/tools/perf/tests/sample-parsing.c +++ b/tools/perf/tests/sample-parsing.c @@ -129,9 +129,6 @@ static bool samples_same(const struct perf_sample *s1, if (type & PERF_SAMPLE_WEIGHT) COMP(weight); - if (type & PERF_SAMPLE_WEIGHT_STRUCT) - COMP(ins_lat); - if (type & PERF_SAMPLE_DATA_SRC) COMP(data_src); @@ -245,7 +242,6 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format) .cgroup = 114, .data_page_size = 115, .code_page_size = 116, - .ins_lat = 117, .aux_sample = { .size = sizeof(aux_data), .data = (void *)aux_data, |