diff options
| author | Avi Kivity <avi@redhat.com> | 2010-04-23 13:49:06 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-05-17 12:19:15 +0300 |
| commit | 8d3b9323095ae977406c7f4e73c9aa0f47682cc2 (patch) | |
| tree | 43ebc414eb8401e8bde250242c9c5d2572e43e70 /include | |
| parent | d14769377a247d4e7b570592a090474c8a059938 (diff) | |
| parent | 6eca8cc35b50af1037bc919106dd6dd332c959c2 (diff) | |
| download | linux-stable-8d3b9323095ae977406c7f4e73c9aa0f47682cc2.tar.gz linux-stable-8d3b9323095ae977406c7f4e73c9aa0f47682cc2.tar.bz2 linux-stable-8d3b9323095ae977406c7f4e73c9aa0f47682cc2.zip | |
Merge remote branch 'tip/perf/core'
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/perf_event.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 24de5f181a41..ace31fbac513 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -941,10 +941,8 @@ static inline void perf_event_mmap(struct vm_area_struct *vma) } extern struct perf_guest_info_callbacks *perf_guest_cbs; -extern int perf_register_guest_info_callbacks( - struct perf_guest_info_callbacks *); -extern int perf_unregister_guest_info_callbacks( - struct perf_guest_info_callbacks *); +extern int perf_register_guest_info_callbacks(struct perf_guest_info_callbacks *callbacks); +extern int perf_unregister_guest_info_callbacks(struct perf_guest_info_callbacks *callbacks); extern void perf_event_comm(struct task_struct *tsk); extern void perf_event_fork(struct task_struct *tsk); @@ -1016,9 +1014,9 @@ static inline void perf_bp_event(struct perf_event *event, void *data) { } static inline int perf_register_guest_info_callbacks -(struct perf_guest_info_callbacks *) {return 0; } +(struct perf_guest_info_callbacks *callbacks) { return 0; } static inline int perf_unregister_guest_info_callbacks -(struct perf_guest_info_callbacks *) {return 0; } +(struct perf_guest_info_callbacks *callbacks) { return 0; } static inline void perf_event_mmap(struct vm_area_struct *vma) { } static inline void perf_event_comm(struct task_struct *tsk) { } |