summaryrefslogtreecommitdiffstats
path: root/drivers/oprofile/buffer_sync.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-10-15 15:51:08 +0200
committerRobert Richter <robert.richter@amd.com>2010-10-29 11:54:18 +0200
commit3d7851b3cdd43a734e5cc4c643fd886ab28ad4d5 (patch)
treec78750f357d78e226faa83d393b19e963dd85fa2 /drivers/oprofile/buffer_sync.c
parentoprofile: Fix the hang while taking the cpu offline (diff)
downloadlinux-3d7851b3cdd43a734e5cc4c643fd886ab28ad4d5.tar.xz
linux-3d7851b3cdd43a734e5cc4c643fd886ab28ad4d5.zip
oprofile: Remove deprecated use of flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed. sync_stop() currently cancels cpu_buffer works inside buffer_mutex and flushes the system workqueue outside. Instead, split end_cpu_work() into two parts - stopping further work enqueues and flushing works - and do the former inside buffer_mutex and latter outside. For stable kernels v2.6.35.y and v2.6.36.y. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: stable@kernel.org Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'drivers/oprofile/buffer_sync.c')
-rw-r--r--drivers/oprofile/buffer_sync.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
index b7e755f4178a..a3984f4ef192 100644
--- a/drivers/oprofile/buffer_sync.c
+++ b/drivers/oprofile/buffer_sync.c
@@ -190,7 +190,7 @@ void sync_stop(void)
profile_event_unregister(PROFILE_TASK_EXIT, &task_exit_nb);
task_handoff_unregister(&task_free_nb);
mutex_unlock(&buffer_mutex);
- flush_scheduled_work();
+ flush_cpu_work();
/* make sure we don't leak task structs */
process_task_mortuary();