Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934152AbaFSRlF (ORCPT ); Thu, 19 Jun 2014 13:41:05 -0400 Received: from terminus.zytor.com ([198.137.202.10]:60452 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933473AbaFSRlC (ORCPT ); Thu, 19 Jun 2014 13:41:02 -0400 Date: Thu, 19 Jun 2014 10:39:40 -0700 From: tip-bot for Vince Weaver Message-ID: Cc: linux-kernel@vger.kernel.org, brueckner@linux.vnet.ibm.com, hpa@zytor.com, mingo@kernel.org, schwidefsky@de.ibm.com, peterz@infradead.org, thuth@linux.vnet.ibm.com, vincent.weaver@maine.edu, heiko.carstens@de.ibm.com, tglx@linutronix.de, paul.gortmaker@windriver.com Reply-To: mingo@kernel.org, hpa@zytor.com, brueckner@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, peterz@infradead.org, schwidefsky@de.ibm.com, thuth@linux.vnet.ibm.com, vincent.weaver@maine.edu, heiko.carstens@de.ibm.com, tglx@linutronix.de, paul.gortmaker@windriver.com In-Reply-To: References: To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] s390, perf: Use common PMU interrupt disabled code Git-Commit-ID: 97b1198fece06d495270222bcf5fde4c8cb0b5b0 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: 97b1198fece06d495270222bcf5fde4c8cb0b5b0 Gitweb: http://git.kernel.org/tip/97b1198fece06d495270222bcf5fde4c8cb0b5b0 Author: Vince Weaver AuthorDate: Sun, 15 Jun 2014 02:05:23 -0400 Committer: Ingo Molnar CommitDate: Thu, 19 Jun 2014 19:37:50 +0200 s390, perf: Use common PMU interrupt disabled code Transition to using the new generic PERF_PMU_CAP_NO_INTERRUPT method for failing a sampling event when no PMU interrupt is available. Signed-off-by: Vince Weaver Signed-off-by: Peter Zijlstra Cc: Heiko Carstens Cc: Hendrik Brueckner Cc: Martin Schwidefsky Cc: Paul Gortmaker Cc: Thomas Huth Cc: linux390@de.ibm.com Cc: linux-s390@vger.kernel.org Link: http://lkml.kernel.org/r/alpine.DEB.2.10.1406150204290.16738@vincent-weaver-1.umelst.maine.edu Signed-off-by: Ingo Molnar --- arch/s390/kernel/perf_cpum_cf.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/s390/kernel/perf_cpum_cf.c b/arch/s390/kernel/perf_cpum_cf.c index ea75d01..d3194de 100644 --- a/arch/s390/kernel/perf_cpum_cf.c +++ b/arch/s390/kernel/perf_cpum_cf.c @@ -411,12 +411,6 @@ static int cpumf_pmu_event_init(struct perf_event *event) case PERF_TYPE_HARDWARE: case PERF_TYPE_HW_CACHE: case PERF_TYPE_RAW: - /* The CPU measurement counter facility does not have overflow - * interrupts to do sampling. Sampling must be provided by - * external means, for example, by timers. - */ - if (is_sampling_event(event)) - return -ENOENT; err = __hw_perf_event_init(event); break; default: @@ -681,6 +675,12 @@ static int __init cpumf_pmu_init(void) goto out; } + /* The CPU measurement counter facility does not have overflow + * interrupts to do sampling. Sampling must be provided by + * external means, for example, by timers. + */ + cpumf_pmu.capabilities |= PERF_PMU_CAP_NO_INTERRUPT; + cpumf_pmu.attr_groups = cpumf_cf_event_group(); rc = perf_pmu_register(&cpumf_pmu, "cpum_cf", PERF_TYPE_RAW); if (rc) { -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/