diff options
Diffstat (limited to 'include/linux/perf_event.h')
-rw-r--r-- | include/linux/perf_event.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 24a635887f28..8fc5f0fada5e 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h | |||
@@ -896,7 +896,7 @@ perf_event_create_kernel_counter(struct perf_event_attr *attr, | |||
896 | void *context); | 896 | void *context); |
897 | extern void perf_pmu_migrate_context(struct pmu *pmu, | 897 | extern void perf_pmu_migrate_context(struct pmu *pmu, |
898 | int src_cpu, int dst_cpu); | 898 | int src_cpu, int dst_cpu); |
899 | extern u64 perf_event_read_local(struct perf_event *event); | 899 | int perf_event_read_local(struct perf_event *event, u64 *value); |
900 | extern u64 perf_event_read_value(struct perf_event *event, | 900 | extern u64 perf_event_read_value(struct perf_event *event, |
901 | u64 *enabled, u64 *running); | 901 | u64 *enabled, u64 *running); |
902 | 902 | ||
@@ -1301,7 +1301,10 @@ static inline const struct perf_event_attr *perf_event_attrs(struct perf_event * | |||
1301 | { | 1301 | { |
1302 | return ERR_PTR(-EINVAL); | 1302 | return ERR_PTR(-EINVAL); |
1303 | } | 1303 | } |
1304 | static inline u64 perf_event_read_local(struct perf_event *event) { return -EINVAL; } | 1304 | static inline int perf_event_read_local(struct perf_event *event, u64 *value) |
1305 | { | ||
1306 | return -EINVAL; | ||
1307 | } | ||
1305 | static inline void perf_event_print_debug(void) { } | 1308 | static inline void perf_event_print_debug(void) { } |
1306 | static inline int perf_event_task_disable(void) { return -EINVAL; } | 1309 | static inline int perf_event_task_disable(void) { return -EINVAL; } |
1307 | static inline int perf_event_task_enable(void) { return -EINVAL; } | 1310 | static inline int perf_event_task_enable(void) { return -EINVAL; } |