perf: Fix up delayed_put_task_struct()
Commit-ID: 4e231c7962ce711c7d8c2a4dc23ecd1e8fc28363 Gitweb: http://git.kernel.org/tip/4e231c7962ce711c7d8c2a4dc23ecd1e8fc28363 Author: Peter Zijlstra <[email protected]> AuthorDate: Thu, 9 Sep 2010 21:01:59 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 9 Sep 2010 21:07:09 +0200
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 <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by Ingo Molnar <[email protected]>
--- include/linux/perf_event.h | 2 ++ kernel/exit.c | 4 +--- kernel/perf_event.c | 8 ++++++++ 3 files changed, 11 insertions(+), 3 deletions(-)
include/linux/perf_event.h +2 -0
@@ -889,6 +889,7 @@ extern void perf_event_task_sched_out(struct task_struct *task, struct task_struextern int perf_event_init_task (struct task_struct *child);extern void perf_event_exit_task (struct task_struct *child);extern void perf_event_free_task (struct task_struct *task); +extern void perf_event_delayed_put (struct task_struct *task);extern void set_perf_event_pending (void );extern void perf_event_do_pending (void );extern void perf_event_print_debug (void );
@@ -1067,6 +1068,7 @@ perf_event_task_sched_out(struct task_struct *task,static inline int perf_event_init_task (struct task_struct *child) {return 0 ; }static inline void perf_event_exit_task (struct task_struct *child) { }static inline void perf_event_free_task (struct task_struct *task) { } +static inline void perf_event_delayed_put (struct task_struct *task) { }static inline void perf_event_do_pending (void ) { }static inline void perf_event_print_debug (void ) { }static inline int perf_event_task_disable (void ) {return -EINVAL ; }
kernel/exit.c +1 -3
@@ -149,9 +149,7 @@ static void delayed_put_task_struct(struct rcu_head *rhp) { struct task_struct *tsk = container_of(rhp, struct task_struct, rcu); -#ifdef CONFIG_PERF_EVENTS -WARN_ON_ONCE (tsk->perf_event_ctxp); -#endif +perf_event_delayed_put (tsk);trace_sched_process_free (tsk);put_task_struct (tsk); }
kernel/perf_event.c +8 -0
@@ -5893,6 +5893,14 @@ again: } } +void perf_event_delayed_put (struct task_struct *task) +{ +int ctxn; + +for_each_task_context_nr (ctxn) +WARN_ON_ONCE (task->perf_event_ctxp[ctxn]); +} +/* * inherit a event from parent task to child task: */