diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-10-02 10:51:41 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-10-02 10:51:41 +0300 |
| commit | a4c9f26533eb547c8123e9a5f77517f61d19d2c2 (patch) | |
| tree | 9767715779be7314ea86b1a83ae96f72e5ddb0da /arch/x86/include/asm/perf_event.h | |
| parent | 97e831e13015045c098e1187f9b8b8e9bace9413 (diff) | |
| parent | dd45407c0b2445bc2aa0ecfea744d5af3a146577 (diff) | |
| download | linux-a4c9f26533eb547c8123e9a5f77517f61d19d2c2.tar.xz | |
Merge branch 'x86/cache' into perf/core, to resolve conflicts
Avoid conflict with upcoming perf/core patches, merge in the RDT perf work.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/perf_event.h')
| -rw-r--r-- | arch/x86/include/asm/perf_event.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h index 78241b736f2a..8bdf74902293 100644 --- a/arch/x86/include/asm/perf_event.h +++ b/arch/x86/include/asm/perf_event.h @@ -278,6 +278,7 @@ struct perf_guest_switch_msr { extern struct perf_guest_switch_msr *perf_guest_get_msrs(int *nr); extern void perf_get_x86_pmu_capability(struct x86_pmu_capability *cap); extern void perf_check_microcode(void); +extern int x86_perf_rdpmc_index(struct perf_event *event); #else static inline struct perf_guest_switch_msr *perf_guest_get_msrs(int *nr) { |