From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932088AbeAQQ35 (ORCPT ); Wed, 17 Jan 2018 11:29:57 -0500 Received: from terminus.zytor.com ([65.50.211.136]:51877 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754181AbeAQQ3u (ORCPT ); Wed, 17 Jan 2018 11:29:50 -0500 Date: Wed, 17 Jan 2018 08:25:09 -0800 From: tip-bot for Mathieu Poirier Message-ID: 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 Reply-To: acme@redhat.com, tglx@linutronix.de, alexander.shishkin@linux.intel.com, peterz@infradead.org, jolsa@kernel.org, ak@linux.intel.com, mathieu.poirier@linaro.org, mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, namhyung@kernel.org In-Reply-To: <1515617211-32024-1-git-send-email-mathieu.poirier@linaro.org> References: <1515617211-32024-1-git-send-email-mathieu.poirier@linaro.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf evsel: Fix incorrect handling of type _TERM_DRV_CFG Git-Commit-ID: 2178790baa8639a1f516f91685ae64cc8d09fee7 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 2178790baa8639a1f516f91685ae64cc8d09fee7 Gitweb: https://git.kernel.org/tip/2178790baa8639a1f516f91685ae64cc8d09fee7 Author: Mathieu Poirier AuthorDate: Wed, 10 Jan 2018 13:46:51 -0700 Committer: Arnaldo Carvalho de Melo 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 Acked-by: Jiri Olsa Cc: Alexander Shishkin Cc: Andi Kleen Cc: Namhyung Kim Cc: Peter Zijlstra 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 --- 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; }