Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d7851b3 authored by Tejun Heo's avatar Tejun Heo Committed by Robert Richter
Browse files

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: default avatarTejun Heo <tj@kernel.org>
Cc: stable@kernel.org
Signed-off-by: default avatarRobert Richter <robert.richter@amd.com>
parent 4ac3dbec

drivers/oprofile/buffer_sync.c

+1 −1
Original line number Diff line number Diff line
@@ -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();

drivers/oprofile/cpu_buffer.c

+7 −3
Original line number Diff line number Diff line
@@ -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);

	}

}

drivers/oprofile/cpu_buffer.h

+1 −0
Original line number Diff line number Diff line
@@ -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)