2013-05-06 21:45:10

by Marc Dionne

Subject: [PATCH] workqueue: Make schedule_work() available again to non GPL modules

Commit 8425e3d5bdbe ("workqueue: inline trivial wrappers") changed
schedule_work() and schedule_delayed_work() to inline wrappers,
but these rely on some symbols that are EXPORT_SYMBOL_GPL, while
the original functions were EXPORT_SYMBOL. This has the effect of
changing the licensing requirement for these functions and making
them unavailable to non GPL modules.

Make them available again by removing the restriction on the
required symbols.

Signed-off-by: Marc Dionne <[email protected]>
---
kernel/workqueue.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 4aa9f5b..b7db830 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -296,7 +296,7 @@ static DEFINE_HASHTABLE(unbound_pool_hash, UNBOUND_POOL_HASH_ORDER);
static struct workqueue_attrs *unbound_std_wq_attrs[NR_STD_WORKER_POOLS];

struct workqueue_struct *system_wq __read_mostly;
-EXPORT_SYMBOL_GPL(system_wq);
+EXPORT_SYMBOL(system_wq);
struct workqueue_struct *system_highpri_wq __read_mostly;
EXPORT_SYMBOL_GPL(system_highpri_wq);
struct workqueue_struct *system_long_wq __read_mostly;
@@ -1411,7 +1411,7 @@ bool queue_work_on(int cpu, struct workqueue_struct *wq,
local_irq_restore(flags);
return ret;
}
-EXPORT_SYMBOL_GPL(queue_work_on);
+EXPORT_SYMBOL(queue_work_on);

void delayed_work_timer_fn(unsigned long __data)
{
@@ -1485,7 +1485,7 @@ bool queue_delayed_work_on(int cpu, struct workqueue_struct *wq,
local_irq_restore(flags);
return ret;
}
-EXPORT_SYMBOL_GPL(queue_delayed_work_on);
+EXPORT_SYMBOL(queue_delayed_work_on);

/**
* mod_delayed_work_on - modify delay of or queue a delayed work on specific CPU
--
1.8.1.4

2013-05-06 22:49:52

by Tejun Heo

Subject: Re: [PATCH] workqueue: Make schedule_work() available again to non GPL modules

On Mon, May 06, 2013 at 05:44:55PM -0400, Marc Dionne wrote:
> Commit 8425e3d5bdbe ("workqueue: inline trivial wrappers") changed
> schedule_work() and schedule_delayed_work() to inline wrappers,
> but these rely on some symbols that are EXPORT_SYMBOL_GPL, while
> the original functions were EXPORT_SYMBOL. This has the effect of
> changing the licensing requirement for these functions and making
> them unavailable to non GPL modules.
>
> Make them available again by removing the restriction on the
> required symbols.
>
> Signed-off-by: Marc Dionne <[email protected]>

Will apply to workqueue/for-3.10-fixes once v3.10-rc1 drops.

Thanks.

--
tejun

2013-05-14 18:53:31

by Tejun Heo

Subject: Re: [PATCH] workqueue: Make schedule_work() available again to non GPL modules

On Mon, May 06, 2013 at 05:44:55PM -0400, Marc Dionne wrote:
> Commit 8425e3d5bdbe ("workqueue: inline trivial wrappers") changed
> schedule_work() and schedule_delayed_work() to inline wrappers,
> but these rely on some symbols that are EXPORT_SYMBOL_GPL, while
> the original functions were EXPORT_SYMBOL. This has the effect of
> changing the licensing requirement for these functions and making
> them unavailable to non GPL modules.
>
> Make them available again by removing the restriction on the
> required symbols.
>
> Signed-off-by: Marc Dionne <[email protected]>

Applied to wq/for-3.10-fixes.

Thanks.

--
tejun