[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-2178790baa8639a1f516f91685ae64cc8d09fee7@git.kernel.org>
Date: Wed, 17 Jan 2018 08:25:09 -0800
From: tip-bot for Mathieu Poirier <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: acme@...hat.com, tglx@...utronix.de,
alexander.shishkin@...ux.intel.com, jolsa@...nel.org,
peterz@...radead.org, mingo@...nel.org, hpa@...or.com,
ak@...ux.intel.com, mathieu.poirier@...aro.org,
namhyung@...nel.org, linux-kernel@...r.kernel.org
Subject: [tip:perf/core] perf evsel: Fix incorrect handling of type
_TERM_DRV_CFG
Commit-ID: 2178790baa8639a1f516f91685ae64cc8d09fee7
Gitweb: https://git.kernel.org/tip/2178790baa8639a1f516f91685ae64cc8d09fee7
Author: Mathieu Poirier <mathieu.poirier@...aro.org>
AuthorDate: Wed, 10 Jan 2018 13:46:51 -0700
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Thu, 11 Jan 2018 11:56:07 -0300
perf evsel: Fix incorrect handling of type _TERM_DRV_CFG
Commit ("d0565132605f 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@...aro.org>
Acked-by: Jiri Olsa <jolsa@...nel.org>
Cc: Alexander Shishkin <alexander.shishkin@...ux.intel.com>
Cc: Andi Kleen <ak@...ux.intel.com>
Cc: Namhyung Kim <namhyung@...nel.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Fixes: d0565132605f ("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@...hat.com>
---
tools/perf/util/evsel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index d934f04e3..4eea3b4 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -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;
}
Powered by blists - more mailing lists