diff options
| author |   Jason Gunthorpe <jgg@mellanox.com> | 2017-12-27 21:50:46 -0700 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2017-12-27 21:50:46 -0700 |
| commit | 76a895d9e1332ca3cfa3edff3dc04420dfd7d603 (patch) | |
| tree | aa6a436505a6c495a8243165a336d3bd56f69f12 /drivers/infiniband/ulp/ipoib/ipoib_cm.c | |
| parent | infiniband: drop unknown function from core_priv.h (diff) | |
| parent | RDMA/vmw_pvrdma: Remove usage of BIT() from UAPI header (diff) | |
| download | linux-dev-76a895d9e1332ca3cfa3edff3dc04420dfd7d603.tar.xz linux-dev-76a895d9e1332ca3cfa3edff3dc04420dfd7d603.zip | |
Merge branch 'from-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git
Patches for 4.16 that are dependent on patches sent to 4.15-rc.
These are small clean ups for the vmw_pvrdma and i40iw drivers.
* 'from-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git:
RDMA/vmw_pvrdma: Remove usage of BIT() from UAPI header
RDMA/vmw_pvrdma: Use refcount_t instead of atomic_t
RDMA/vmw_pvrdma: Use more specific sizeof in kcalloc
RDMA/vmw_pvrdma: Clarify QP and CQ is_kernel logic
RDMA/vmw_pvrdma: Add UAR SRQ macros in ABI header file
i40iw: Change accelerated flag to bool
Diffstat (limited to 'drivers/infiniband/ulp/ipoib/ipoib_cm.c')
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_cm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c index c0a596e4c258..d45b0f2aa987 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c @@ -1145,6 +1145,7 @@ static int ipoib_cm_tx_init(struct ipoib_cm_tx *p, u32 qpn, noio_flag = memalloc_noio_save(); p->tx_ring = vzalloc(ipoib_sendq_size * sizeof(*p->tx_ring)); if (!p->tx_ring) { + memalloc_noio_restore(noio_flag); ret = -ENOMEM; goto err_tx; } |