Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp1214476imm; Wed, 25 Jul 2018 13:43:28 -0700 (PDT) X-Google-Smtp-Source: AAOMgpccUtyuxzjGB1qvr/rTZKwqtr+3eumAItI2HeWlF6J8gqHC7oG2h8qPkG+OOYqqIfujGsac X-Received: by 2002:a62:4255:: with SMTP id p82-v6mr23821171pfa.238.1532551408864; Wed, 25 Jul 2018 13:43:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532551408; cv=none; d=google.com; s=arc-20160816; b=qG8TaeCW/PeLkxvBqHfHQkiyN8Byp4GlUQeRQ7oKzlZAIaHyrzCEP7mDrGd0D/acuK PanKeyxoZsEp5F7VPxefCNuaKICqHJYhXj+6hfXeBwJfi4Jcrfgg2w7A8W/ZRoS/dN+d cmopruPNdQO2aXP6Lhh+tWTR6kt0vfzn7GEonU0fPdFFYs+e/sjRJZTyWGG8twDtoDrr J9i5DfftmpI2Pk+D4fkusEGHFBL2Yh01ZyTkSog+1UYwxzeO8WweAIgQPrfz7rAfV8LG bNV4ze3RFZIfiBabTLlEjp+RkkP9/NnV1p9v2kvaDC0qqBrvqD/p/ozos2a5+aV/GV6V bikg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-disposition :content-transfer-encoding:mime-version:robot-unsubscribe:robot-id :git-commit-id:subject:to:references:in-reply-to:reply-to:cc :message-id:from:date:arc-authentication-results; bh=cvTpgmEBr14+fRg9ghzZKy7t6VKUmAFckeYTLLtQ+JU=; b=JKsWeNFCvmFcHAkchwAqn68cu6CZtJejsbmNqx2nJjb/uMJSUErvFPs4xcASzPq9Rj QcnjW5AegmY+BN4DhJoYJ/kE1whZRajNuNcgRtu3DoF+UUx70ffn/VMgzdpOYsAdE84B jOKeBd3vevGySpQB7kXV4rM98Iecd34MA9QBUbC+0YFWwRLy92NlG4q3K5lHz//uGt6R mqgVygXNlBQDIy9S/lOd1k99oC2/8sq4+5PJasnfzAZnvqvGuekqZNT6+ZFgQZyFpwSg wpyH1UjOZb2qEM6/9u3sVA4WTQ//dzfMvGSs2xVpZU5LGNyXp8R/7R8RAf4mlBldROj+ exIQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j10-v6si12803552pgq.503.2018.07.25.13.43.14; Wed, 25 Jul 2018 13:43:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731413AbeGYVz2 (ORCPT + 99 others); Wed, 25 Jul 2018 17:55:28 -0400 Received: from terminus.zytor.com ([198.137.202.136]:37931 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730305AbeGYVz2 (ORCPT ); Wed, 25 Jul 2018 17:55:28 -0400 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTPS id w6PKfxnQ498581 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 25 Jul 2018 13:41:59 -0700 Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id w6PKfxMl498577; Wed, 25 Jul 2018 13:41:59 -0700 Date: Wed, 25 Jul 2018 13:41:59 -0700 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for Thomas Richter Message-ID: Cc: brueckner@linux.ibm.com, linux-kernel@vger.kernel.org, tmricht@linux.ibm.com, tglx@linutronix.de, mingo@kernel.org, schwidefsky@de.ibm.com, acme@redhat.com, hpa@zytor.com, brueckner@linux.vnet.ibm.com, heiko.carstens@de.ibm.com Reply-To: acme@redhat.com, heiko.carstens@de.ibm.com, brueckner@linux.vnet.ibm.com, hpa@zytor.com, linux-kernel@vger.kernel.org, tmricht@linux.ibm.com, brueckner@linux.ibm.com, mingo@kernel.org, schwidefsky@de.ibm.com, tglx@linutronix.de In-Reply-To: <20180621080452.61012-1-tmricht@linux.ibm.com> References: <20180621080452.61012-1-tmricht@linux.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] Revert "perf list: Add s390 support for detailed/verbose PMU event description" Git-Commit-ID: b8b5ab52bc3a0423080783ae563801077f7ea400 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 X-Spam-Status: No, score=-0.7 required=5.0 tests=ALL_TRUSTED,BAYES_00, DATE_IN_FUTURE_48_96 autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on terminus.zytor.com Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b8b5ab52bc3a0423080783ae563801077f7ea400 Gitweb: https://git.kernel.org/tip/b8b5ab52bc3a0423080783ae563801077f7ea400 Author: Thomas Richter AuthorDate: Thu, 21 Jun 2018 10:04:49 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 24 Jul 2018 14:48:58 -0300 Revert "perf list: Add s390 support for detailed/verbose PMU event description" This reverts commit 038586c34301578e538f6c5aa79ca82bce1b9152. Fix the support of detailed/verbose PMU event description by using the "Unit": keyword in the json files to address event names refering to the /sys/devices/cpum_[cs]f devices. Signed-off-by: Thomas Richter Reviewed-by: Hendrik Brueckner Cc: Heiko Carstens Cc: Hendrik Brueckner Cc: Martin Schwidefsky Link: http://lkml.kernel.org/r/20180621080452.61012-1-tmricht@linux.ibm.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/pmu.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 3ba6a1742f91..afd68524ffa9 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -652,12 +652,6 @@ static int is_arm_pmu_core(const char *name) if (stat(path, &st) == 0) return 1; - /* Look for cpu sysfs (specific to s390) */ - scnprintf(path, PATH_MAX, "%s/bus/event_source/devices/%s", - sysfs, name); - if (stat(path, &st) == 0 && !strncmp(name, "cpum_", 5)) - return 1; - return 0; }