diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-03 12:32:31 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-03 12:32:31 -0500 |
| commit | 001f3a48877a24afa7dfead84eb4678c68ab062e (patch) | |
| tree | e485df2946c08f65883a755279b663947a6b33cb /arch/x86/include/asm/perf_event.h | |
| parent | 2ce3f2b3b1a646d82b86991c424b5121e0322cb8 (diff) | |
| parent | 1018faa6cf23b256bf25919ef203cd7c129f06f2 (diff) | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/x86/kvm: Fix Host-Only/Guest-Only counting with SVM disabled
Diffstat (limited to 'arch/x86/include/asm/perf_event.h')
| -rw-r--r-- | arch/x86/include/asm/perf_event.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h index 096c975e099f..461ce432b1c2 100644 --- a/arch/x86/include/asm/perf_event.h +++ b/arch/x86/include/asm/perf_event.h | |||
| @@ -242,4 +242,12 @@ static inline void perf_get_x86_pmu_capability(struct x86_pmu_capability *cap) | |||
| 242 | static inline void perf_events_lapic_init(void) { } | 242 | static inline void perf_events_lapic_init(void) { } |
| 243 | #endif | 243 | #endif |
| 244 | 244 | ||
| 245 | #if defined(CONFIG_PERF_EVENTS) && defined(CONFIG_CPU_SUP_AMD) | ||
| 246 | extern void amd_pmu_enable_virt(void); | ||
| 247 | extern void amd_pmu_disable_virt(void); | ||
| 248 | #else | ||
| 249 | static inline void amd_pmu_enable_virt(void) { } | ||
| 250 | static inline void amd_pmu_disable_virt(void) { } | ||
| 251 | #endif | ||
| 252 | |||
| 245 | #endif /* _ASM_X86_PERF_EVENT_H */ | 253 | #endif /* _ASM_X86_PERF_EVENT_H */ |