Sparse config fields are technically supported although currently unused. field_prep() only works for contiguous bitfields so replace it with pmu_format_value().
Signed-off-by: James Clark james.clark@linaro.org --- tools/perf/util/pmu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 956ea273c2c7805c0cb504fb7dcf996f79f5588d..2c26c8d76bed920c7b5b43beb867e4d1bcaa2970 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -144,6 +144,8 @@ struct perf_pmu_format { };
static int pmu_aliases_parse(struct perf_pmu *pmu); +static void pmu_format_value(unsigned long *format, __u64 value, __u64 *v, + bool zero);
static struct perf_pmu_format *perf_pmu__new_format(struct list_head *list, char *name) { @@ -1381,7 +1383,6 @@ bool evsel__is_aux_event(const struct evsel *evsel) * the bit pattern. It is shifted into position by this function, so to set * something to true, pass 1 for val rather than a pre shifted value. */ -#define field_prep(_mask, _val) (((_val) << (ffsll(_mask) - 1)) & (_mask)) void evsel__set_config_if_unset(struct perf_pmu *pmu, struct evsel *evsel, const char *config_name, u64 val) { @@ -1398,8 +1399,7 @@ void evsel__set_config_if_unset(struct perf_pmu *pmu, struct evsel *evsel, return;
/* Otherwise replace it */ - evsel->core.attr.config &= ~bits; - evsel->core.attr.config |= field_prep(bits, val); + pmu_format_value(&bits, val, &evsel->core.attr.config, /*zero=*/true); }
static struct perf_pmu_format *