[packages/kernel] - fix symbol visibility breakage in 4.2 - rel 2

baggins baggins at pld-linux.org
Sun Sep 27 20:44:13 CEST 2015


commit e34d68adc429325fe7503703a6ea71b64cb69226
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Sep 27 20:43:44 2015 +0200

    - fix symbol visibility breakage in 4.2
    - rel 2

 kernel-small_fixes.patch | 40 ++++++++++++++++++++++++++++++++++++++++
 kernel.spec              |  2 +-
 2 files changed, 41 insertions(+), 1 deletion(-)
---
diff --git a/kernel.spec b/kernel.spec
index 3fe77d8..ae70fc5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@
 %define		have_pcmcia	0
 %endif
 
-%define		rel		1
+%define		rel		2
 %define		basever		4.2
 %define		postver		.1
 
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 01e03aa..905698f 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -97,3 +97,43 @@ index 28011fb1..c6ded6b 100644
  	.pkts_acked     = bictcp_acked,
  	.owner		= THIS_MODULE,
  	.name		= "cubic",
+From: Tim Gardner <tim.gardner at canonical.com>
+
+commit 1dadafa86a779884f14a6e7a3ddde1a57b0a0a65 upstream.
+
+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 at canonical.com>
+Signed-off-by: Tejun Heo <tj at kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
+
+---
+ kernel/workqueue.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/kernel/workqueue.c
++++ b/kernel/workqueue.c
+@@ -2614,7 +2614,7 @@ void flush_workqueue(struct workqueue_st
+ out_unlock:
+ 	mutex_unlock(&wq->mutex);
+ }
+-EXPORT_SYMBOL_GPL(flush_workqueue);
++EXPORT_SYMBOL(flush_workqueue);
+ 
+ /**
+  * drain_workqueue - drain a workqueue
+
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
+the body of a message to majordomo at vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+Please read the FAQ at  http://www.tux.org/lkml/
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/e34d68adc429325fe7503703a6ea71b64cb69226



More information about the pld-cvs-commit mailing list