From: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
To: <tj@kernel.org>, <jiangshanlai@gmail.com>,
<linux-kernel@vger.kernel.org>
Cc: <amd-gfx@lists.freedesktop.org>, <Christian.Koenig@amd.com>,
"Andrey Grodzovsky" <andrey.grodzovsky@amd.com>
Subject: [PATCH] Revert "workqueue: remove unused cancel_work()"
Date: Thu, 19 May 2022 09:56:42 -0400 [thread overview]
Message-ID: <20220519135642.83209-1-andrey.grodzovsky@amd.com> (raw)
This reverts commit 6417250d3f894e66a68ba1cd93676143f2376a6f
and exports the function.
We need this funtion in amdgpu driver to fix a bug.
Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
---
include/linux/workqueue.h | 1 +
kernel/workqueue.c | 9 +++++++++
2 files changed, 10 insertions(+)
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index 7fee9b6cfede..9e41e1226193 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -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);
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 613917bbc4e7..f94b596ebffd 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -3267,6 +3267,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
--
2.25.1
next reply other threads:[~2022-05-19 13:58 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-19 13:56 Andrey Grodzovsky [this message]
2022-05-19 14:52 ` Lai Jiangshan
[not found] ` <e1e2e63d-a1a9-12ad-97a7-a3771210edda@amd.com>
2022-05-20 0:47 ` Lai Jiangshan
2022-05-20 6:22 ` Christian König
2022-05-20 7:52 ` Tejun Heo
2022-05-21 4:04 ` Andrey Grodzovsky
2022-06-07 17:14 ` Tejun Heo
2022-06-07 17:39 ` Alex Deucher
2022-06-07 19:25 ` Tejun Heo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220519135642.83209-1-andrey.grodzovsky@amd.com \
--to=andrey.grodzovsky@amd.com \
--cc=Christian.Koenig@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=jiangshanlai@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®