Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932131AbbHDR0Y (ORCPT ); Tue, 4 Aug 2015 13:26:24 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:35912 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753813AbbHDR0W (ORCPT ); Tue, 4 Aug 2015 13:26:22 -0400 From: tim.gardner@canonical.com To: linux-kernel@vger.kernel.org Cc: Tim Gardner , Tejun Heo Subject: [PATCH 4.2-rc5] workqueue: Make flush_workqueue() available again to non GPL modules Date: Tue, 4 Aug 2015 11:26:04 -0600 Message-Id: <1438709164-3645-1-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1364 Lines: 39 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/