Gentoo Archives: gentoo-commits

From: Mike Pagano <mpagano@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/linux-patches:4.2 commit in: /
Date: Tue, 29 Sep 2015 19:16:27
Message-Id: 1444045775.ddc71720a6ed4cec05ef162cbcab0a74b71f76a7.mpagano@gentoo
1 commit: ddc71720a6ed4cec05ef162cbcab0a74b71f76a7
2 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 5 11:49:35 2015 +0000
4 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 5 11:49:35 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=ddc71720
7
8 Remove redundant patch
9
10 2710_flush-workqueue-non-GPL-availability.patch | 33 -------------------------
11 1 file changed, 33 deletions(-)
12
13 diff --git a/2710_flush-workqueue-non-GPL-availability.patch b/2710_flush-workqueue-non-GPL-availability.patch
14 deleted file mode 100644
15 index 3e017d4..0000000
16 --- a/2710_flush-workqueue-non-GPL-availability.patch
17 +++ /dev/null
18 @@ -1,33 +0,0 @@
19 -From 1dadafa86a779884f14a6e7a3ddde1a57b0a0a65 Mon Sep 17 00:00:00 2001
20 -From: Tim Gardner <tim.gardner@×××××××××.com>
21 -Date: Tue, 4 Aug 2015 11:26:04 -0600
22 -Subject: workqueue: Make flush_workqueue() available again to non GPL modules
23 -
24 -Commit 37b1ef31a568fc02e53587620226e5f3c66454c8 ("workqueue: move
25 -flush_scheduled_work() to workqueue.h") moved the exported non GPL
26 -flush_scheduled_work() from a function to an inline wrapper.
27 -Unfortunately, it directly calls flush_workqueue() which is a GPL function.
28 -This has the effect of changing the licensing requirement for this function
29 -and makes it unavailable to non GPL modules.
30 -
31 -See commit ad7b1f841f8a54c6d61ff181451f55b68175e15a ("workqueue: Make
32 -schedule_work() available again to non GPL modules") for precedent.
33 -
34 -Signed-off-by: Tim Gardner <tim.gardner@×××××××××.com>
35 -Signed-off-by: Tejun Heo <tj@××××××.org>
36 -
37 -diff --git a/kernel/workqueue.c b/kernel/workqueue.c
38 -index 4c4f061..a413acb 100644
39 ---- a/kernel/workqueue.c
40 -+++ b/kernel/workqueue.c
41 -@@ -2614,7 +2614,7 @@ void flush_workqueue(struct workqueue_struct *wq)
42 - out_unlock:
43 - mutex_unlock(&wq->mutex);
44 - }
45 --EXPORT_SYMBOL_GPL(flush_workqueue);
46 -+EXPORT_SYMBOL(flush_workqueue);
47 -
48 - /**
49 - * drain_workqueue - drain a workqueue
50 ---
51 -cgit v0.10.2