Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3cf4d99 authored by Doug Ledford's avatar Doug Ledford
Browse files

Merge branch 'misc' into k.o/for-next 



Conflicts:
	drivers/infiniband/core/iwcm.c - The rdma_netlink patches in
	HEAD and the iwarp cm workqueue fix (don't use WQ_MEM_RECLAIM,
	we aren't safe for that context) touched the same code.

Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parents 3e5f0881 9d6fd7ac

drivers/infiniband/core/cm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -4304,7 +4304,7 @@ static int __init ib_cm_init(void) 
		goto error1;

		goto error1;

	}

	}





	cm.wq = create_workqueue("ib_cm");

	cm.wq = alloc_workqueue("ib_cm", 0, 1);

	if (!cm.wq) {

	if (!cm.wq) {

		ret = -ENOMEM;

		ret = -ENOMEM;

		goto error2;

		goto error2;

drivers/infiniband/core/device.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -523,7 +523,7 @@ int ib_register_device(struct ib_device *device, 
	device->reg_state = IB_DEV_REGISTERED;

	device->reg_state = IB_DEV_REGISTERED;





	list_for_each_entry(client, &client_list, list)

	list_for_each_entry(client, &client_list, list)

		if (client->add && !add_client_context(device, client))

		if (!add_client_context(device, client) && client->add)

			client->add(device);

			client->add(device);





	device->index = __dev_new_index();

	device->index = __dev_new_index();
@@ -612,7 +612,7 @@ int ib_register_client(struct ib_client *client) 
	mutex_lock(&device_mutex);

	mutex_lock(&device_mutex);





	list_for_each_entry(device, &device_list, core_list)

	list_for_each_entry(device, &device_list, core_list)

		if (client->add && !add_client_context(device, client))

		if (!add_client_context(device, client) && client->add)

			client->add(device);

			client->add(device);





	down_write(&lists_rwsem);

	down_write(&lists_rwsem);

drivers/infiniband/core/iwcm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1177,7 +1177,7 @@ static int __init iw_cm_init(void) 
		pr_err("iw_cm: couldn't init iwpm\n");

		pr_err("iw_cm: couldn't init iwpm\n");

	else

	else

		rdma_nl_register(RDMA_NL_IWCM, iwcm_nl_cb_table);

		rdma_nl_register(RDMA_NL_IWCM, iwcm_nl_cb_table);

	iwcm_wq = alloc_ordered_workqueue("iw_cm_wq", WQ_MEM_RECLAIM);

	iwcm_wq = alloc_ordered_workqueue("iw_cm_wq", 0);

	if (!iwcm_wq)

	if (!iwcm_wq)

		return -ENOMEM;

		return -ENOMEM;

drivers/infiniband/core/uverbs_cmd.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1020,7 +1020,7 @@ static struct ib_ucq_object *create_cq(struct ib_uverbs_file *file, 
	cq->uobject       = &obj->uobject;

	cq->uobject       = &obj->uobject;

	cq->comp_handler  = ib_uverbs_comp_handler;

	cq->comp_handler  = ib_uverbs_comp_handler;

	cq->event_handler = ib_uverbs_cq_event_handler;

	cq->event_handler = ib_uverbs_cq_event_handler;

	cq->cq_context    = &ev_file->ev_queue;

	cq->cq_context    = ev_file ? &ev_file->ev_queue : NULL;

	atomic_set(&cq->usecnt, 0);

	atomic_set(&cq->usecnt, 0);





	obj->uobject.object = cq;

	obj->uobject.object = cq;

drivers/infiniband/hw/bnxt_re/ib_verbs.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3372,7 +3372,7 @@ int bnxt_re_dealloc_ucontext(struct ib_ucontext *ib_uctx) 
					    &rdev->qplib_res.dpi_tbl,

					    &rdev->qplib_res.dpi_tbl,

					    &uctx->dpi);

					    &uctx->dpi);

		if (rc)

		if (rc)

			dev_err(rdev_to_dev(rdev), "Deallocte HW DPI failed!");

			dev_err(rdev_to_dev(rdev), "Deallocate HW DPI failed!");

			/* Don't fail, continue*/

			/* Don't fail, continue*/

		uctx->dpi.dbr = NULL;

		uctx->dpi.dbr = NULL;

	}

	}