From: Arnaldo Carvalho de Melo Date: Mon, 18 Jul 2022 13:36:11 +0000 (-0300) Subject: Merge remote-tracking branch 'torvalds/master' into perf/core X-Git-Tag: v6.0-rc1~95^2~145 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=0698461ad2984892a47582a58eb235488d3aac7f;p=linux-block.git Merge remote-tracking branch 'torvalds/master' into perf/core To update the perf/core codebase. Fix conflict by moving arch__post_evsel_config(evsel, attr) to the end of evsel__config(), after what was added in: 49c692b7dfc9b6c0 ("perf offcpu: Accept allowed sample types only") Signed-off-by: Arnaldo Carvalho de Melo --- 0698461ad2984892a47582a58eb235488d3aac7f diff --cc tools/perf/util/evsel.c index 8fea51a9cd90,094b0a9c0bc0..a67cc3f2fa74 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@@ -1372,7 -1373,8 +1378,10 @@@ void evsel__config(struct evsel *evsel if (evsel__is_dummy_event(evsel)) evsel__reset_sample_bit(evsel, BRANCH_STACK); + if (evsel__is_offcpu_event(evsel)) + evsel->core.attr.sample_type &= OFFCPU_SAMPLE_TYPES; ++ + arch__post_evsel_config(evsel, attr); } int evsel__set_filter(struct evsel *evsel, const char *filter)