Commit-ID: d7302ac28ba24eeac512c8f45107c962c701eb38 Gitweb: http://git.kernel.org/tip/d7302ac28ba24eeac512c8f45107c962c701eb38 Author: Vince Weaver <vincent.wea...@maine.edu> AuthorDate: Sun, 15 Jun 2014 02:05:23 -0400 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Wed, 18 Jun 2014 18:43:47 +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 <vincent.wea...@maine.edu> Signed-off-by: Peter Zijlstra <pet...@infradead.org> Cc: Heiko Carstens <heiko.carst...@de.ibm.com> Cc: Hendrik Brueckner <brueck...@linux.vnet.ibm.com> Cc: Martin Schwidefsky <schwidef...@de.ibm.com> Cc: Paul Gortmaker <paul.gortma...@windriver.com> Cc: Thomas Huth <th...@linux.vnet.ibm.com> Cc: linux...@de.ibm.com Cc: linux-s...@vger.kernel.org Link: http://lkml.kernel.org/r/alpine.deb.2.10.1406150204290.16...@vincent-weaver-1.umelst.maine.edu Signed-off-by: Ingo Molnar <mi...@kernel.org> --- 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 majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
