diff options
| author | Tejun Heo <tj@kernel.org> | 2010-10-15 09:51:08 -0400 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2010-10-29 11:54:18 +0200 |
| commit | 3d7851b3cdd43a734e5cc4c643fd886ab28ad4d5 (patch) | |
| tree | c78750f357d78e226faa83d393b19e963dd85fa2 | |
| parent | 4ac3dbec800d93485a5c84e37af676278eea657c (diff) | |
| download | op-kernel-dev-3d7851b3cdd43a734e5cc4c643fd886ab28ad4d5.zip op-kernel-dev-3d7851b3cdd43a734e5cc4c643fd886ab28ad4d5.tar.gz | |
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>
| -rw-r--r-- | drivers/oprofile/buffer_sync.c | 2 | ||||
| -rw-r--r-- | drivers/oprofile/cpu_buffer.c | 10 | ||||
| -rw-r--r-- | drivers/oprofile/cpu_buffer.h | 1 |
3 files changed, 9 insertions, 4 deletions
diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c index b7e755f..a3984f4 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(); diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c index f179ac2..59f5544 100644 --- a/drivers/oprofile/cpu_buffer.c +++ b/drivers/oprofile/cpu_buffer.c @@ -111,14 +111,18 @@ void start_cpu_work(void) void end_cpu_work(void) { - int i; - work_enabled = 0; +} + +void flush_cpu_work(void) +{ + int i; for_each_online_cpu(i) { struct oprofile_cpu_buffer *b = &per_cpu(op_cpu_buffer, i); - cancel_delayed_work(&b->work); + /* these works are per-cpu, no need for flush_sync */ + flush_delayed_work(&b->work); } } diff --git a/drivers/oprofile/cpu_buffer.h b/drivers/oprofile/cpu_buffer.h index 68ea16a..e1d097e 100644 --- a/drivers/oprofile/cpu_buffer.h +++ b/drivers/oprofile/cpu_buffer.h @@ -25,6 +25,7 @@ void free_cpu_buffers(void); void start_cpu_work(void); void end_cpu_work(void); +void flush_cpu_work(void); /* CPU buffer is composed of such entries (which are * also used for context switch notes) |
