From: tip-bot for Mathieu Poirier <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, tglx@linutronix.de,
alexander.shishkin@linux.intel.com, jolsa@kernel.org,
peterz@infradead.org, mingo@kernel.org, hpa@zytor.com,
ak@linux.intel.com, mathieu.poirier@linaro.org,
namhyung@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip:perf/core] perf evsel: Fix incorrect handling of type _TERM_DRV_CFG
Date: Wed, 17 Jan 2018 08:25:09 -0800 [thread overview]
Message-ID: <tip-2178790baa8639a1f516f91685ae64cc8d09fee7@git.kernel.org> (raw)
In-Reply-To: <1515617211-32024-1-git-send-email-mathieu.poirier@linaro.org>
Commit-ID: 2178790baa8639a1f516f91685ae64cc8d09fee7
Gitweb: https://git.kernel.org/tip/2178790baa8639a1f516f91685ae64cc8d09fee7
Author: Mathieu Poirier <mathieu.poirier@linaro.org>
AuthorDate: Wed, 10 Jan 2018 13:46:51 -0700
Committer: Arnaldo Carvalho de Melo <acme@redhat.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@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: 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@redhat.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;
}
prev parent reply other threads:[~2018-01-17 16:29 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-10 20:46 [PATCH] perf evsel: Fix incorrect handling of type _TERM_DRV_CFG Mathieu Poirier
2018-01-11 14:51 ` Jiri Olsa
2018-01-11 14:58 ` Arnaldo Carvalho de Melo
2018-01-17 16:25 ` tip-bot for Mathieu Poirier [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-2178790baa8639a1f516f91685ae64cc8d09fee7@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.