diff options
| author |   Jason Gunthorpe <jgg@mellanox.com> | 2019-10-28 16:36:29 -0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2019-10-28 16:36:29 -0300 |
| commit | 036313316d3a38bfde9ba49b3d00f73b7d8019d2 (patch) | |
| tree | 284127b68e10bd919adb420a5f37dc19d06532f6 /drivers/infiniband/hw/vmw_pvrdma | |
| parent | RDMA/vmw_pvrdma: Use resource ids from physical device if available (diff) | |
| parent | Linux 5.4-rc5 (diff) | |
| download | linux-dev-036313316d3a38bfde9ba49b3d00f73b7d8019d2.tar.xz linux-dev-036313316d3a38bfde9ba49b3d00f73b7d8019d2.zip | |
Merge tag 'v5.4-rc5' into rdma.git for-next
Linux 5.4-rc5
For dependencies in the next patches
Conflict resolved by keeping the delete of the unlock.
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'drivers/infiniband/hw/vmw_pvrdma')
| -rw-r--r-- | drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c index 6cac0c88cf39..36cdfbdbd325 100644 --- a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c +++ b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c @@ -230,8 +230,6 @@ static void pvrdma_free_srq(struct pvrdma_dev *dev, struct pvrdma_srq *srq) pvrdma_page_dir_cleanup(dev, &srq->pdir); - kfree(srq); - atomic_dec(&dev->num_srqs); } |