aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arc
diff options
context:
space:
mode:
authorVince Weaver <vincent.weaver@maine.edu>2014-06-15 02:00:18 -0400
committerIngo Molnar <mingo@kernel.org>2014-06-18 12:43:44 -0400
commit2cc9e588b0ff80c209c59a3e369c73e591535ba8 (patch)
treecacda48f32688071d4eed0e791befe7d0ab6fce9 /arch/arc
parentcf230918cda19532e4a5cc4f0d5c82fa7e5e94f6 (diff)
arc, 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.weaver@maine.edu> Acked-by: Vineet Gupta <vgupta@synopsys.com> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Cc: Arnaldo Carvalho de Melo <acme@kernel.org> Cc: Grant Likely <grant.likely@linaro.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Rob Herring <robh+dt@kernel.org> Link: http://lkml.kernel.org/r/alpine.DEB.2.10.1406150159280.16738@vincent-weaver-1.umelst.maine.edu Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arc')
-rw-r--r--arch/arc/kernel/perf_event.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arc/kernel/perf_event.c b/arch/arc/kernel/perf_event.c
index 63177e4cb66d..b9a5685a990e 100644
--- a/arch/arc/kernel/perf_event.c
+++ b/arch/arc/kernel/perf_event.c
@@ -99,10 +99,6 @@ static int arc_pmu_event_init(struct perf_event *event)
99 struct hw_perf_event *hwc = &event->hw; 99 struct hw_perf_event *hwc = &event->hw;
100 int ret; 100 int ret;
101 101
102 /* ARC 700 PMU does not support sampling events */
103 if (is_sampling_event(event))
104 return -ENOENT;
105
106 switch (event->attr.type) { 102 switch (event->attr.type) {
107 case PERF_TYPE_HARDWARE: 103 case PERF_TYPE_HARDWARE:
108 if (event->attr.config >= PERF_COUNT_HW_MAX) 104 if (event->attr.config >= PERF_COUNT_HW_MAX)
@@ -298,6 +294,9 @@ static int arc_pmu_device_probe(struct platform_device *pdev)
298 .read = arc_pmu_read, 294 .read = arc_pmu_read,
299 }; 295 };
300 296
297 /* ARC 700 PMU does not support sampling events */
298 arc_pmu->pmu.capabilities |= PERF_PMU_CAP_NO_INTERRUPT;
299
301 ret = perf_pmu_register(&arc_pmu->pmu, pdev->name, PERF_TYPE_RAW); 300 ret = perf_pmu_register(&arc_pmu->pmu, pdev->name, PERF_TYPE_RAW);
302 301
303 return ret; 302 return ret;