diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-22 15:45:41 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-22 15:45:41 -0700 |
commit | 6bc4c3ad3619e1bcb4a6330e030007ace8ca465e (patch) | |
tree | dda9505c22e85417ee752ef90ff7848126cca0f0 /arch/x86/kernel/cpu/perf_event.h | |
parent | c58267e9fa7b0345dd9006939254701e3622ca6a (diff) | |
parent | 0f02adaa49af23ab9fa05375f4a237da6014401b (diff) | |
download | linux-6bc4c3ad3619e1bcb4a6330e030007ace8ca465e.tar.gz linux-6bc4c3ad3619e1bcb4a6330e030007ace8ca465e.tar.bz2 linux-6bc4c3ad3619e1bcb4a6330e030007ace8ca465e.zip |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"These are the left over fixes from the v4.1 cycle"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf tools: Fix build breakage if prefix= is specified
perf/x86: Honor the architectural performance monitoring version
perf/x86/intel: Fix PMI handling for Intel PT
perf/x86/intel/bts: Fix DS area sharing with x86_pmu events
perf/x86: Add more Broadwell model numbers
perf: Fix ring_buffer_attach() RCU sync, again
Diffstat (limited to 'arch/x86/kernel/cpu/perf_event.h')
-rw-r--r-- | arch/x86/kernel/cpu/perf_event.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.h b/arch/x86/kernel/cpu/perf_event.h index 74089bcb6d74..3e7fd27dfe20 100644 --- a/arch/x86/kernel/cpu/perf_event.h +++ b/arch/x86/kernel/cpu/perf_event.h @@ -716,6 +716,10 @@ int x86_add_exclusive(unsigned int what); void x86_del_exclusive(unsigned int what); +int x86_reserve_hardware(void); + +void x86_release_hardware(void); + void hw_perf_lbr_event_destroy(struct perf_event *event); int x86_setup_perfctr(struct perf_event *event); |