From efcc2e5a79f65ff32ee94cb32814531fa756c5bf Mon Sep 17 00:00:00 2001 From: Hendrik Brueckner Date: Wed, 30 Jan 2013 17:51:56 +0100 Subject: [PATCH] --- yaml --- r: 356123 b: refs/heads/master c: 151a0eb6c8e4398f76453c791d8fd8f8167a7517 h: refs/heads/master i: 356121: bbc1f8314cfbf2e1bdb01a9e5a49c3ee3b223275 356119: 97d54889b58c2cfcbab0a6cbaa7bab4f282ee1b5 v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/perf_cpum_cf.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 0dae8f385eb4..c9ad1eee3fb1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bddb7ae217cea0ef722468fce823f9e19a69c561 +refs/heads/master: 151a0eb6c8e4398f76453c791d8fd8f8167a7517 diff --git a/trunk/arch/s390/kernel/perf_cpum_cf.c b/trunk/arch/s390/kernel/perf_cpum_cf.c index 86ec7447e1f5..390d9ae57bb2 100644 --- a/trunk/arch/s390/kernel/perf_cpum_cf.c +++ b/trunk/arch/s390/kernel/perf_cpum_cf.c @@ -367,13 +367,6 @@ static int __hw_perf_event_init(struct perf_event *event) if (ev >= PERF_CPUM_CF_MAX_CTR) return -EINVAL; - /* The CPU measurement counter facility does not have any interrupts - * to do sampling. Sampling must be provided by external means, - * for example, by timers. - */ - if (hwc->sample_period) - return -EINVAL; - /* Use the hardware perf event structure to store the counter number * in 'config' member and the counter set to which the counter belongs * in the 'config_base'. The counter set (config_base) is then used @@ -418,6 +411,12 @@ 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: