diff options
| author | Marc Zyngier <maz@kernel.org> | 2021-04-22 13:41:49 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-04-22 13:41:49 +0100 |
| commit | 9a8aae605b80fc0a830cdce747eed48e11acc067 (patch) | |
| tree | c3d138d0c96f9303ec117398f9b96c256f9a09f3 /include | |
| parent | 4085ae809334f036ec01790d1bac41a8ec3116da (diff) | |
| parent | 7f318847a0f37b96d8927e8d30ae7b8f149b11f1 (diff) | |
| download | linux-9a8aae605b80fc0a830cdce747eed48e11acc067.tar.bz2 | |
Merge branch 'kvm-arm64/kill_oprofile_dependency' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/kvm/arm_pmu.h | 4 | ||||
| -rw-r--r-- | include/linux/perf_event.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/kvm/arm_pmu.h b/include/kvm/arm_pmu.h index 6fd3cda608e4..864b9997efb2 100644 --- a/include/kvm/arm_pmu.h +++ b/include/kvm/arm_pmu.h @@ -61,6 +61,7 @@ int kvm_arm_pmu_v3_get_attr(struct kvm_vcpu *vcpu, int kvm_arm_pmu_v3_has_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr); int kvm_arm_pmu_v3_enable(struct kvm_vcpu *vcpu); +int kvm_pmu_probe_pmuver(void); #else struct kvm_pmu { }; @@ -116,6 +117,9 @@ static inline u64 kvm_pmu_get_pmceid(struct kvm_vcpu *vcpu, bool pmceid1) { return 0; } + +static inline int kvm_pmu_probe_pmuver(void) { return 0xf; } + #endif #endif diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 3f7f89ea5e51..51154ed9a206 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -951,8 +951,6 @@ extern void perf_event_itrace_started(struct perf_event *event); extern int perf_pmu_register(struct pmu *pmu, const char *name, int type); extern void perf_pmu_unregister(struct pmu *pmu); -extern int perf_num_counters(void); -extern const char *perf_pmu_name(void); extern void __perf_event_task_sched_in(struct task_struct *prev, struct task_struct *task); extern void __perf_event_task_sched_out(struct task_struct *prev, |