aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/perf_event.h
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2010-09-09 15:01:59 -0400
committerIngo Molnar <mingo@elte.hu>2010-09-09 15:07:09 -0400
commit4e231c7962ce711c7d8c2a4dc23ecd1e8fc28363 (patch)
tree05af30e5c2f1084d8e77c89f0e55beaafa2194c0 /include/linux/perf_event.h
parent1b9a644fece117cfa5474a2388d6b89d1baf8ddf (diff)
perf: Fix up delayed_put_task_struct()
I missed a perf_event_ctxp user when converting it to an array. Pull this last user into perf_event.c as well and fix it up. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> LKML-Reference: <new-submission> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/perf_event.h')
-rw-r--r--include/linux/perf_event.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index c1173520f14d..93bf53aa50e5 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -889,6 +889,7 @@ extern void perf_event_task_sched_out(struct task_struct *task, struct task_stru
889extern int perf_event_init_task(struct task_struct *child); 889extern int perf_event_init_task(struct task_struct *child);
890extern void perf_event_exit_task(struct task_struct *child); 890extern void perf_event_exit_task(struct task_struct *child);
891extern void perf_event_free_task(struct task_struct *task); 891extern void perf_event_free_task(struct task_struct *task);
892extern void perf_event_delayed_put(struct task_struct *task);
892extern void set_perf_event_pending(void); 893extern void set_perf_event_pending(void);
893extern void perf_event_do_pending(void); 894extern void perf_event_do_pending(void);
894extern void perf_event_print_debug(void); 895extern void perf_event_print_debug(void);
@@ -1067,6 +1068,7 @@ perf_event_task_sched_out(struct task_struct *task,
1067static inline int perf_event_init_task(struct task_struct *child) { return 0; } 1068static inline int perf_event_init_task(struct task_struct *child) { return 0; }
1068static inline void perf_event_exit_task(struct task_struct *child) { } 1069static inline void perf_event_exit_task(struct task_struct *child) { }
1069static inline void perf_event_free_task(struct task_struct *task) { } 1070static inline void perf_event_free_task(struct task_struct *task) { }
1071static inline void perf_event_delayed_put(struct task_struct *task) { }
1070static inline void perf_event_do_pending(void) { } 1072static inline void perf_event_do_pending(void) { }
1071static inline void perf_event_print_debug(void) { } 1073static inline void perf_event_print_debug(void) { }
1072static inline int perf_event_task_disable(void) { return -EINVAL; } 1074static inline int perf_event_task_disable(void) { return -EINVAL; }