35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
|
From 1dadafa86a779884f14a6e7a3ddde1a57b0a0a65 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Tim Gardner <tim.gardner@canonical.com>
|
||
|
|
Date: Tue, 4 Aug 2015 11:26:04 -0600
|
||
|
|
Subject: workqueue: Make flush_workqueue() available again to non GPL modules
|
||
|
|
|
||
|
|
Commit 37b1ef31a568fc02e53587620226e5f3c66454c8 ("workqueue: move
|
||
|
|
flush_scheduled_work() to workqueue.h") moved the exported non GPL
|
||
|
|
flush_scheduled_work() from a function to an inline wrapper.
|
||
|
|
Unfortunately, it directly calls flush_workqueue() which is a GPL function.
|
||
|
|
This has the effect of changing the licensing requirement for this function
|
||
|
|
and makes it unavailable to non GPL modules.
|
||
|
|
|
||
|
|
See commit ad7b1f841f8a54c6d61ff181451f55b68175e15a ("workqueue: Make
|
||
|
|
schedule_work() available again to non GPL modules") for precedent.
|
||
|
|
|
||
|
|
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
|
||
|
|
Signed-off-by: Tejun Heo <tj@kernel.org>
|
||
|
|
|
||
|
|
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
|
||
|
|
index 4c4f061..a413acb 100644
|
||
|
|
--- a/kernel/workqueue.c
|
||
|
|
+++ b/kernel/workqueue.c
|
||
|
|
@@ -2614,7 +2614,7 @@ void flush_workqueue(struct workqueue_struct *wq)
|
||
|
|
out_unlock:
|
||
|
|
mutex_unlock(&wq->mutex);
|
||
|
|
}
|
||
|
|
-EXPORT_SYMBOL_GPL(flush_workqueue);
|
||
|
|
+EXPORT_SYMBOL(flush_workqueue);
|
||
|
|
|
||
|
|
/**
|
||
|
|
* drain_workqueue - drain a workqueue
|
||
|
|
--
|
||
|
|
cgit v0.10.2
|
||
|
|
|