diff options
| author | Rohit Vaswani <rvaswani@codeaurora.org> | 2016-03-03 12:14:26 -0800 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:48:26 -0700 |
| commit | 854c24916858c6b8b27e417a1ecb3e3ea982350d (patch) | |
| tree | 5f14f8fa4d3616c90f64980404e167f96d319ec3 /include/linux | |
| parent | 06a8a7d33a9dc9e8059a02c2baf66ccddca2284e (diff) | |
| parent | b1fc3efb2dc34b396687921e6cdc4463b66fe9b4 (diff) | |
Merge branch 'perf' into new-rc2
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/perf/arm_pmu.h | 10 | ||||
| -rw-r--r-- | include/linux/perf_event.h | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/perf/arm_pmu.h b/include/linux/perf/arm_pmu.h index bfa673bb822d..dd3ea60948a8 100644 --- a/include/linux/perf/arm_pmu.h +++ b/include/linux/perf/arm_pmu.h @@ -149,6 +149,16 @@ int arm_pmu_device_probe(struct platform_device *pdev, const struct of_device_id *of_table, const struct pmu_probe_info *probe_table); +int armv8pmu_enable_intens(int idx); +int armv8pmu_disable_intens(int idx); +int armv8pmu_enable_counter(int idx); +int armv8pmu_disable_counter(int idx); +u32 armv8pmu_getreset_flags(void); +void armv8pmu_pmcr_write(u32 val); +void armv8pmu_write_evtype(int idx, u32 val); + +int kryo_pmu_init(struct arm_pmu *cpu_pmu); + #endif /* CONFIG_ARM_PMU */ #endif /* __ARM_PMU_H__ */ diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index f9828a48f16a..3e83459c6604 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -753,6 +753,7 @@ extern u64 perf_event_read_local(struct perf_event *event); extern u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running); +extern struct dentry *perf_create_debug_dir(void); struct perf_sample_data { /* |