* [PATCH] workqueue: WQ_NON_REENTRANT is meaningless and going away [not found] <532BF8BC.5060007@huawei.com> @ 2014-03-27 1:41 ` ZhangZhen 2014-03-27 15:21 ` Tejun Heo ` (2 more replies) 0 siblings, 3 replies; 5+ messages in thread From: ZhangZhen @ 2014-03-27 1:41 UTC (permalink / raw) To: Tejun Heo; +Cc: jchapman, linux-mmc, tgih.jun Tejun Heo has made WQ_NON_REENTRANT useless in the commit:dbf2576e37 ("workqueue: make all workqueues non-reentrant"). So remove its usages. This patch doesn't introduce any behavior changes. Signed-off-by: zhangzhen <zhenzhang.zhang@huawei.com> --- drivers/mmc/host/dw_mmc.c | 2 +- include/linux/workqueue.h | 6 ------ net/l2tp/l2tp_core.c | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 55cd110..c204b7d 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2607,7 +2607,7 @@ int dw_mci_probe(struct dw_mci *host) tasklet_init(&host->tasklet, dw_mci_tasklet_func, (unsigned long)host); host->card_workqueue = alloc_workqueue("dw-mci-card", - WQ_MEM_RECLAIM | WQ_NON_REENTRANT, 1); + WQ_MEM_RECLAIM, 1); if (!host->card_workqueue) { ret = -ENOMEM; goto err_dmaunmap; diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index 594521b..57b2687 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -295,12 +295,6 @@ static inline unsigned int work_static(struct work_struct *work) { return 0; } * Documentation/workqueue.txt. */ enum { - /* - * All wqs are now non-reentrant making the following flag - * meaningless. Will be removed. - */ - WQ_NON_REENTRANT = 1 << 0, /* DEPRECATED */ - WQ_UNBOUND = 1 << 1, /* not bound to any cpu */ WQ_FREEZABLE = 1 << 2, /* freeze during suspend */ WQ_MEM_RECLAIM = 1 << 3, /* may be used for memory reclaim */ diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c index 735d0f6..fcbd63e 100644 --- a/net/l2tp/l2tp_core.c +++ b/net/l2tp/l2tp_core.c @@ -2016,7 +2016,7 @@ static int __init l2tp_init(void) if (rc) goto out; - l2tp_wq = alloc_workqueue("l2tp", WQ_NON_REENTRANT | WQ_UNBOUND, 0); + l2tp_wq = alloc_workqueue("l2tp", WQ_UNBOUND, 0); if (!l2tp_wq) { pr_err("alloc_workqueue failed\n"); rc = -ENOMEM; -- 1.6.0.2 . _______________________________________________ kernel.openeuler mailing list kernel.openeuler@huawei.com http://rnd-openeuler.huawei.com/mailman/listinfo/kernel.openeuler . ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] workqueue: WQ_NON_REENTRANT is meaningless and going away 2014-03-27 1:41 ` [PATCH] workqueue: WQ_NON_REENTRANT is meaningless and going away ZhangZhen @ 2014-03-27 15:21 ` Tejun Heo 2014-03-27 23:25 ` Ulf Hansson 2014-03-27 17:08 ` James Chapman 2014-03-29 13:36 ` Tejun Heo 2 siblings, 1 reply; 5+ messages in thread From: Tejun Heo @ 2014-03-27 15:21 UTC (permalink / raw) To: ZhangZhen; +Cc: jchapman, linux-mmc, tgih.jun, Chris Ball On Thu, Mar 27, 2014 at 09:41:47AM +0800, ZhangZhen wrote: > Tejun Heo has made WQ_NON_REENTRANT useless in the commit:dbf2576e37 ("workqueue: make all > workqueues non-reentrant"). So remove its usages. > > This patch doesn't introduce any behavior changes. > > Signed-off-by: zhangzhen <zhenzhang.zhang@huawei.com> James, Chris, can you guys please ack this? I think it'd be best to route it through workqueue branch. Thanks. > --- > drivers/mmc/host/dw_mmc.c | 2 +- > include/linux/workqueue.h | 6 ------ > net/l2tp/l2tp_core.c | 2 +- > 3 files changed, 2 insertions(+), 8 deletions(-) > > diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c > index 55cd110..c204b7d 100644 > --- a/drivers/mmc/host/dw_mmc.c > +++ b/drivers/mmc/host/dw_mmc.c > @@ -2607,7 +2607,7 @@ int dw_mci_probe(struct dw_mci *host) > > tasklet_init(&host->tasklet, dw_mci_tasklet_func, (unsigned long)host); > host->card_workqueue = alloc_workqueue("dw-mci-card", > - WQ_MEM_RECLAIM | WQ_NON_REENTRANT, 1); > + WQ_MEM_RECLAIM, 1); > if (!host->card_workqueue) { > ret = -ENOMEM; > goto err_dmaunmap; > diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h > index 594521b..57b2687 100644 > --- a/include/linux/workqueue.h > +++ b/include/linux/workqueue.h > @@ -295,12 +295,6 @@ static inline unsigned int work_static(struct work_struct *work) { return 0; } > * Documentation/workqueue.txt. > */ > enum { > - /* > - * All wqs are now non-reentrant making the following flag > - * meaningless. Will be removed. > - */ > - WQ_NON_REENTRANT = 1 << 0, /* DEPRECATED */ > - > WQ_UNBOUND = 1 << 1, /* not bound to any cpu */ > WQ_FREEZABLE = 1 << 2, /* freeze during suspend */ > WQ_MEM_RECLAIM = 1 << 3, /* may be used for memory reclaim */ > diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c > index 735d0f6..fcbd63e 100644 > --- a/net/l2tp/l2tp_core.c > +++ b/net/l2tp/l2tp_core.c > @@ -2016,7 +2016,7 @@ static int __init l2tp_init(void) > if (rc) > goto out; > > - l2tp_wq = alloc_workqueue("l2tp", WQ_NON_REENTRANT | WQ_UNBOUND, 0); > + l2tp_wq = alloc_workqueue("l2tp", WQ_UNBOUND, 0); > if (!l2tp_wq) { > pr_err("alloc_workqueue failed\n"); > rc = -ENOMEM; -- tejun ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] workqueue: WQ_NON_REENTRANT is meaningless and going away 2014-03-27 15:21 ` Tejun Heo @ 2014-03-27 23:25 ` Ulf Hansson 0 siblings, 0 replies; 5+ messages in thread From: Ulf Hansson @ 2014-03-27 23:25 UTC (permalink / raw) To: Tejun Heo Cc: ZhangZhen, jchapman, linux-mmc, tgih.jun@samsung.com, Chris Ball On 27 March 2014 16:21, Tejun Heo <tj@kernel.org> wrote: > On Thu, Mar 27, 2014 at 09:41:47AM +0800, ZhangZhen wrote: >> Tejun Heo has made WQ_NON_REENTRANT useless in the commit:dbf2576e37 ("workqueue: make all >> workqueues non-reentrant"). So remove its usages. >> >> This patch doesn't introduce any behavior changes. >> >> Signed-off-by: zhangzhen <zhenzhang.zhang@huawei.com> > > James, Chris, can you guys please ack this? I think it'd be best to > route it through workqueue branch. > > Thanks. Please, go ahead and take it through the workqueue branch. Acked-by: Ulf Hansson <ulf.hansson@linaro.org> > >> --- >> drivers/mmc/host/dw_mmc.c | 2 +- >> include/linux/workqueue.h | 6 ------ >> net/l2tp/l2tp_core.c | 2 +- >> 3 files changed, 2 insertions(+), 8 deletions(-) >> >> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c >> index 55cd110..c204b7d 100644 >> --- a/drivers/mmc/host/dw_mmc.c >> +++ b/drivers/mmc/host/dw_mmc.c >> @@ -2607,7 +2607,7 @@ int dw_mci_probe(struct dw_mci *host) >> >> tasklet_init(&host->tasklet, dw_mci_tasklet_func, (unsigned long)host); >> host->card_workqueue = alloc_workqueue("dw-mci-card", >> - WQ_MEM_RECLAIM | WQ_NON_REENTRANT, 1); >> + WQ_MEM_RECLAIM, 1); >> if (!host->card_workqueue) { >> ret = -ENOMEM; >> goto err_dmaunmap; >> diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h >> index 594521b..57b2687 100644 >> --- a/include/linux/workqueue.h >> +++ b/include/linux/workqueue.h >> @@ -295,12 +295,6 @@ static inline unsigned int work_static(struct work_struct *work) { return 0; } >> * Documentation/workqueue.txt. >> */ >> enum { >> - /* >> - * All wqs are now non-reentrant making the following flag >> - * meaningless. Will be removed. >> - */ >> - WQ_NON_REENTRANT = 1 << 0, /* DEPRECATED */ >> - >> WQ_UNBOUND = 1 << 1, /* not bound to any cpu */ >> WQ_FREEZABLE = 1 << 2, /* freeze during suspend */ >> WQ_MEM_RECLAIM = 1 << 3, /* may be used for memory reclaim */ >> diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c >> index 735d0f6..fcbd63e 100644 >> --- a/net/l2tp/l2tp_core.c >> +++ b/net/l2tp/l2tp_core.c >> @@ -2016,7 +2016,7 @@ static int __init l2tp_init(void) >> if (rc) >> goto out; >> >> - l2tp_wq = alloc_workqueue("l2tp", WQ_NON_REENTRANT | WQ_UNBOUND, 0); >> + l2tp_wq = alloc_workqueue("l2tp", WQ_UNBOUND, 0); >> if (!l2tp_wq) { >> pr_err("alloc_workqueue failed\n"); >> rc = -ENOMEM; > > -- > tejun > -- > To unsubscribe from this list: send the line "unsubscribe linux-mmc" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] workqueue: WQ_NON_REENTRANT is meaningless and going away 2014-03-27 1:41 ` [PATCH] workqueue: WQ_NON_REENTRANT is meaningless and going away ZhangZhen 2014-03-27 15:21 ` Tejun Heo @ 2014-03-27 17:08 ` James Chapman 2014-03-29 13:36 ` Tejun Heo 2 siblings, 0 replies; 5+ messages in thread From: James Chapman @ 2014-03-27 17:08 UTC (permalink / raw) To: ZhangZhen, Tejun Heo; +Cc: linux-mmc, tgih.jun On 27/03/14 01:41, ZhangZhen wrote: > Tejun Heo has made WQ_NON_REENTRANT useless in the commit:dbf2576e37 ("workqueue: make all > workqueues non-reentrant"). So remove its usages. > > This patch doesn't introduce any behavior changes. > > Signed-off-by: zhangzhen <zhenzhang.zhang@huawei.com> Acked-by: James Chapman <jchapman@katalix.com> ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] workqueue: WQ_NON_REENTRANT is meaningless and going away 2014-03-27 1:41 ` [PATCH] workqueue: WQ_NON_REENTRANT is meaningless and going away ZhangZhen 2014-03-27 15:21 ` Tejun Heo 2014-03-27 17:08 ` James Chapman @ 2014-03-29 13:36 ` Tejun Heo 2 siblings, 0 replies; 5+ messages in thread From: Tejun Heo @ 2014-03-29 13:36 UTC (permalink / raw) To: ZhangZhen; +Cc: jchapman, linux-mmc, tgih.jun On Thu, Mar 27, 2014 at 09:41:47AM +0800, ZhangZhen wrote: > Tejun Heo has made WQ_NON_REENTRANT useless in the commit:dbf2576e37 ("workqueue: make all > workqueues non-reentrant"). So remove its usages. > > This patch doesn't introduce any behavior changes. > > Signed-off-by: zhangzhen <zhenzhang.zhang@huawei.com> Applied to wq/for-3.15. Thanks. -- tejun ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-03-29 13:36 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <532BF8BC.5060007@huawei.com>
2014-03-27 1:41 ` [PATCH] workqueue: WQ_NON_REENTRANT is meaningless and going away ZhangZhen
2014-03-27 15:21 ` Tejun Heo
2014-03-27 23:25 ` Ulf Hansson
2014-03-27 17:08 ` James Chapman
2014-03-29 13:36 ` Tejun Heo
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.