Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify

[net-next-2.6.git] / drivers / oprofile / buffer_sync.c

diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
index b7e755f4178ad885332ccaaeeb5eda492e6dfcfd..a3984f4ef192a1807ed4714d70babb6702a175d8 100644 (file)
--- 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();