Commit 73b4b532 authored by Andrey Grodzovsky's avatar Andrey Grodzovsky Committed by Alex Deucher
Browse files

Revert "workqueue: remove unused cancel_work()" 



This reverts commit 6417250d.

amdpgu need this function in order to prematurly stop pending
reset works when another reset work already in progress.

Acked-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Reviewed-by: default avatarLai <Jiangshan&lt;jiangshanlai@gmail.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4c59b571

include/linux/workqueue.h

+1 −0
Original line number Diff line number Diff line
@@ -453,6 +453,7 @@ extern int schedule_on_each_cpu(work_func_t func); 
int execute_in_process_context(work_func_t fn, struct execute_work *);



extern bool flush_work(struct work_struct *work);

extern bool cancel_work(struct work_struct *work);

extern bool cancel_work_sync(struct work_struct *work);



extern bool flush_delayed_work(struct delayed_work *dwork);

kernel/workqueue.c

+9 −0
Original line number Diff line number Diff line
@@ -3258,6 +3258,15 @@ static bool __cancel_work(struct work_struct *work, bool is_dwork) 
	return ret;

}



/*

 * See cancel_delayed_work()

 */

bool cancel_work(struct work_struct *work)

{

	return __cancel_work(work, false);

}

EXPORT_SYMBOL(cancel_work);



/**

 * cancel_delayed_work - cancel a delayed work

 * @dwork: delayed_work to cancel