summaryrefslogtreecommitdiffstats
path: root/net/l2tp
diff options
context:
space:
mode:
authorZhangZhen <zhenzhang.zhang@huawei.com>2014-03-27 09:41:47 +0800
committerTejun Heo <tj@kernel.org>2014-03-29 09:33:03 -0400
commit59ff3eb6d6f75c6c1c3ea8b46ac2cc64eb216547 (patch)
tree5b5a6d394b1ad473fd689b054653a3e6603a4749 /net/l2tp
parent41f50094b2ab4e37673e41a084ea61b907447159 (diff)
downloadlinux-stable-59ff3eb6d6f75c6c1c3ea8b46ac2cc64eb216547.tar.gz
linux-stable-59ff3eb6d6f75c6c1c3ea8b46ac2cc64eb216547.tar.bz2
linux-stable-59ff3eb6d6f75c6c1c3ea8b46ac2cc64eb216547.zip
workqueue: remove deprecated WQ_NON_REENTRANT
Tejun Heo has made WQ_NON_REENTRANT useless in the dbf2576e37 ("workqueue: make all workqueues non-reentrant"). So remove its usages and definition. This patch doesn't introduce any behavior changes. tj: minor description updates. Signed-off-by: ZhangZhen <zhenzhang.zhang@huawei.com> Sigend-off-by: Tejun Heo <tj@kernel.org> Acked-by: James Chapman <jchapman@katalix.com> Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'net/l2tp')
-rw-r--r--net/l2tp/l2tp_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
index 735d0f60c83a..fcbd63ea4909 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;