From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933718AbbICQOl (ORCPT ); Thu, 3 Sep 2015 12:14:41 -0400 Received: from mail-yk0-f182.google.com ([209.85.160.182]:33468 "EHLO mail-yk0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932820AbbICQOj (ORCPT ); Thu, 3 Sep 2015 12:14:39 -0400 Date: Thu, 3 Sep 2015 12:14:36 -0400 From: Tejun Heo To: tim.gardner@canonical.com Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH 4.2-rc5] workqueue: Make flush_workqueue() available again to non GPL modules Message-ID: <20150903161436.GB10394@mtj.duckdns.org> References: <1438709164-3645-1-git-send-email-tim.gardner@canonical.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1438709164-3645-1-git-send-email-tim.gardner@canonical.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello, Greg. I forgot to add cc tag for stable for the following patch. It's now in mainline as commit 1dadafa86a779884f14a6e7a3ddde1a57b0a0a65. Thanks. On Tue, Aug 04, 2015 at 11:26:04AM -0600, tim.gardner@canonical.com wrote: > From: Tim Gardner > > 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. > > Cc: Tejun Heo > Signed-off-by: Tim Gardner > --- > kernel/workqueue.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > 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 > -- > 1.9.1 > -- tejun