Merge branch 'linus' into irq/core, to fix conflict

[sfrench/cifs-2.6.git] / drivers / infiniband / hw / hns / hns_roce_srq.c

diff --git a/drivers/infiniband/hw/hns/hns_roce_srq.c b/drivers/infiniband/hw/hns/hns_roce_srq.c
index 6eee9deadd122c0ec1263c12fa7b5ceffe50aca4..e64ef6903fb4f627c822e34417b9a5f0ea544980 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_srq.c
+++ b/drivers/infiniband/hw/hns/hns_roce_srq.c
@@ -259,7 +259,7 @@ static int alloc_srq_wrid(struct hns_roce_dev *hr_dev, struct hns_roce_srq *srq)
 
 static void free_srq_wrid(struct hns_roce_srq *srq)
 {
-       kfree(srq->wrid);
+       kvfree(srq->wrid);
        srq->wrid = NULL;
 }