summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Levon <levon@movementarian.org>2003-05-03 04:42:38 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2003-05-03 04:42:38 -0700
commit6afeba7fc1412d095733180b4e46dff8a70fe209 (patch)
tree25d480b4ec92db70fd32ea737796171b0ae100e1
parent47dc44d5a3b6bf64ffcd0e05641012d250535860 (diff)
[PATCH] OProfile update
We were doing del_timer_sync() on shutdown, but not ensuring that any queued work was done as well.
-rw-r--r--drivers/oprofile/buffer_sync.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
index a10eecb5a8ad..1b1fd3e7ab59 100644
--- a/drivers/oprofile/buffer_sync.c
+++ b/drivers/oprofile/buffer_sync.c
@@ -147,6 +147,8 @@ void sync_stop(void)
profile_event_unregister(EXIT_MMAP, &exit_mmap_nb);
profile_event_unregister(EXEC_UNMAP, &exec_unmap_nb);
del_timer_sync(&sync_timer);
+ /* timer might have queued work, make sure it's completed. */
+ flush_scheduled_work();
}