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 <[email protected]>
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
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
