diff options
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/kernel/perf_event.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/sh/kernel/perf_event.c b/arch/sh/kernel/perf_event.c index 02331672b6db..7cfd7f153966 100644 --- a/arch/sh/kernel/perf_event.c +++ b/arch/sh/kernel/perf_event.c | |||
@@ -129,14 +129,6 @@ static int __hw_perf_event_init(struct perf_event *event) | |||
129 | return -ENODEV; | 129 | return -ENODEV; |
130 | 130 | ||
131 | /* | 131 | /* |
132 | * All of the on-chip counters are "limited", in that they have | ||
133 | * no interrupts, and are therefore unable to do sampling without | ||
134 | * further work and timer assistance. | ||
135 | */ | ||
136 | if (hwc->sample_period) | ||
137 | return -EINVAL; | ||
138 | |||
139 | /* | ||
140 | * See if we need to reserve the counter. | 132 | * See if we need to reserve the counter. |
141 | * | 133 | * |
142 | * If no events are currently in use, then we have to take a | 134 | * If no events are currently in use, then we have to take a |
@@ -392,6 +384,13 @@ int register_sh_pmu(struct sh_pmu *_pmu) | |||
392 | 384 | ||
393 | pr_info("Performance Events: %s support registered\n", _pmu->name); | 385 | pr_info("Performance Events: %s support registered\n", _pmu->name); |
394 | 386 | ||
387 | /* | ||
388 | * All of the on-chip counters are "limited", in that they have | ||
389 | * no interrupts, and are therefore unable to do sampling without | ||
390 | * further work and timer assistance. | ||
391 | */ | ||
392 | pmu.capabilities |= PERF_PMU_CAP_NO_INTERRUPT; | ||
393 | |||
395 | WARN_ON(_pmu->num_events > MAX_HWEVENTS); | 394 | WARN_ON(_pmu->num_events > MAX_HWEVENTS); |
396 | 395 | ||
397 | perf_pmu_register(&pmu, "cpu", PERF_TYPE_RAW); | 396 | perf_pmu_register(&pmu, "cpu", PERF_TYPE_RAW); |