diff --git a/[refs] b/[refs] index 15a1ead27eca..83f86e442fbc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aedec08050255db1989a38b59616dd973dfe660b +refs/heads/master: c7f743a669c27f9c392e78fda8829db9d6d50f43 diff --git a/trunk/drivers/infiniband/core/addr.c b/trunk/drivers/infiniband/core/addr.c index d2bb5a9a303f..a91001c59b69 100644 --- a/trunk/drivers/infiniband/core/addr.c +++ b/trunk/drivers/infiniband/core/addr.c @@ -373,7 +373,7 @@ static struct notifier_block nb = { static int addr_init(void) { - addr_wq = create_singlethread_workqueue("ib_addr_wq"); + addr_wq = create_singlethread_workqueue("ib_addr"); if (!addr_wq) return -ENOMEM; diff --git a/trunk/drivers/infiniband/core/cma.c b/trunk/drivers/infiniband/core/cma.c index bc31b54e9cac..db88e609bf42 100644 --- a/trunk/drivers/infiniband/core/cma.c +++ b/trunk/drivers/infiniband/core/cma.c @@ -2494,7 +2494,7 @@ static int cma_init(void) next_port = (next_port % (sysctl_local_port_range[1] - sysctl_local_port_range[0])) + sysctl_local_port_range[0]; - cma_wq = create_singlethread_workqueue("rdma_cm_wq"); + cma_wq = create_singlethread_workqueue("rdma_cm"); if (!cma_wq) return -ENOMEM;