Commit 2178790b authored Jan 10, 2018 by Mathieu Poirier Committed by Arnaldo Carvalho de Melo Jan 11, 2018

perf evsel: Fix incorrect handling of type _TERM_DRV_CFG



Commit ("d0565132 perf evsel: Enable type checking for
perf_evsel_config_term types") assumes PERF_EVSEL__CONFIG_TERM_DRV_CFG
isn't used and as such adds a BUG_ON().

Since the enumeration type is used in macro ADD_CONFIG_TERM() the change
break CoreSight trace acquisition.

This patch restores the original code.

Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Fixes: d0565132 ("perf evsel: Enable type checking for perf_evsel_config_term types")
Link: http://lkml.kernel.org/r/1515617211-32024-1-git-send-email-mathieu.poirier@linaro.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 1ccb8fed

tools/perf/util/evsel.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -781,7 +781,7 @@ static void apply_config_terms(struct perf_evsel *evsel,
		attr->write_backward = term->val.overwrite ? 1 : 0;
		break;
		case PERF_EVSEL__CONFIG_TERM_DRV_CFG:
		BUG_ON(1);
		break;
		default:
		break;
		}

Admin message