diff options
author | Anton Novosyolov | 2015-09-18 20:20:55 +0300 |
---|---|---|
committer | Anton Novosyolov | 2015-09-18 20:20:55 +0300 |
commit | c29b0ba7aa05cdb7fc21413e7e66955839e88ad2 (patch) | |
tree | bb7300e31cf103d7888ffeac4b0966e22d17d967 /0001-make_flush_workqueue_non_gpl.patch | |
parent | 055dbe5a51d6c8303df3b187d4bd3d8be8e85a57 (diff) | |
download | aur-c29b0ba7aa05cdb7fc21413e7e66955839e88ad2.tar.gz |
4.2.0-1
Diffstat (limited to '0001-make_flush_workqueue_non_gpl.patch')
-rw-r--r-- | 0001-make_flush_workqueue_non_gpl.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/0001-make_flush_workqueue_non_gpl.patch b/0001-make_flush_workqueue_non_gpl.patch new file mode 100644 index 000000000000..1ba8cb9b3de0 --- /dev/null +++ b/0001-make_flush_workqueue_non_gpl.patch @@ -0,0 +1,34 @@ +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 + |