Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752965AbdGXKYN (ORCPT ); Mon, 24 Jul 2017 06:24:13 -0400 Received: from terminus.zytor.com ([65.50.211.136]:42947 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754457AbdGXKXt (ORCPT ); Mon, 24 Jul 2017 06:23:49 -0400 Date: Mon, 24 Jul 2017 03:18:11 -0700 From: tip-bot for Kan Liang Message-ID: Cc: mingo@kernel.org, kan.liang@intel.com, peterz@infradead.org, jolsa@redhat.com, torvalds@linux-foundation.org, tglx@linutronix.de, hpa@zytor.com, eranian@google.com, vincent.weaver@maine.edu, alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org, acme@redhat.com Reply-To: torvalds@linux-foundation.org, jolsa@redhat.com, peterz@infradead.org, kan.liang@intel.com, mingo@kernel.org, linux-kernel@vger.kernel.org, acme@redhat.com, alexander.shishkin@linux.intel.com, vincent.weaver@maine.edu, eranian@google.com, hpa@zytor.com, tglx@linutronix.de In-Reply-To: <1499967350-10385-5-git-send-email-kan.liang@intel.com> References: <1499967350-10385-5-git-send-email-kan.liang@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf/x86/intel/uncore: Remove invalid Skylake server CHA filter field Git-Commit-ID: 9ad0fbd8fcd9e6815908c772f8d792a9d764449e 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 Content-Length: 2394 Lines: 54 Commit-ID: 9ad0fbd8fcd9e6815908c772f8d792a9d764449e Gitweb: http://git.kernel.org/tip/9ad0fbd8fcd9e6815908c772f8d792a9d764449e Author: Kan Liang AuthorDate: Thu, 13 Jul 2017 10:35:48 -0700 Committer: Ingo Molnar CommitDate: Mon, 24 Jul 2017 11:13:18 +0200 perf/x86/intel/uncore: Remove invalid Skylake server CHA filter field There is no field c6 and link for CHA BOX FILTER. Signed-off-by: Kan Liang Acked-by: Peter Zijlstra Cc: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver Link: http://lkml.kernel.org/r/1499967350-10385-5-git-send-email-kan.liang@intel.com Signed-off-by: Ingo Molnar --- arch/x86/events/intel/uncore_snbep.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c index a30bf97..2401d06 100644 --- a/arch/x86/events/intel/uncore_snbep.c +++ b/arch/x86/events/intel/uncore_snbep.c @@ -351,7 +351,6 @@ DEFINE_UNCORE_FORMAT_ATTR(filter_cid, filter_cid, "config1:5"); DEFINE_UNCORE_FORMAT_ATTR(filter_link, filter_link, "config1:5-8"); DEFINE_UNCORE_FORMAT_ATTR(filter_link2, filter_link, "config1:6-8"); DEFINE_UNCORE_FORMAT_ATTR(filter_link3, filter_link, "config1:12"); -DEFINE_UNCORE_FORMAT_ATTR(filter_link4, filter_link, "config1:9-12"); DEFINE_UNCORE_FORMAT_ATTR(filter_nid, filter_nid, "config1:10-17"); DEFINE_UNCORE_FORMAT_ATTR(filter_nid2, filter_nid, "config1:32-47"); DEFINE_UNCORE_FORMAT_ATTR(filter_state, filter_state, "config1:18-22"); @@ -3302,7 +3301,6 @@ static struct attribute *skx_uncore_cha_formats_attr[] = { &format_attr_inv.attr, &format_attr_thresh8.attr, &format_attr_filter_tid4.attr, - &format_attr_filter_link4.attr, &format_attr_filter_state5.attr, &format_attr_filter_rem.attr, &format_attr_filter_loc.attr, @@ -3312,7 +3310,6 @@ static struct attribute *skx_uncore_cha_formats_attr[] = { &format_attr_filter_opc_0.attr, &format_attr_filter_opc_1.attr, &format_attr_filter_nc.attr, - &format_attr_filter_c6.attr, &format_attr_filter_isoc.attr, NULL, };