diff options
Diffstat (limited to 'arch/arc')
-rw-r--r-- | arch/arc/include/asm/processor.h | 2 | ||||
-rw-r--r-- | arch/arc/kernel/perf_event.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/arc/include/asm/processor.h b/arch/arc/include/asm/processor.h index d99f9b37cd15..82588f3ba77f 100644 --- a/arch/arc/include/asm/processor.h +++ b/arch/arc/include/asm/processor.h | |||
@@ -62,6 +62,8 @@ unsigned long thread_saved_pc(struct task_struct *t); | |||
62 | #define cpu_relax() do { } while (0) | 62 | #define cpu_relax() do { } while (0) |
63 | #endif | 63 | #endif |
64 | 64 | ||
65 | #define cpu_relax_lowlatency() cpu_relax() | ||
66 | |||
65 | #define copy_segments(tsk, mm) do { } while (0) | 67 | #define copy_segments(tsk, mm) do { } while (0) |
66 | #define release_segments(mm) do { } while (0) | 68 | #define release_segments(mm) do { } while (0) |
67 | 69 | ||
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; |