Merge branch 'master'

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/infiniband/hw/mthca/mthca_provider.h b/drivers/infiniband/hw/mthca/mthca_provider.h
index 179a8f610d0f..8de2887ba15c 100644
--- a/drivers/infiniband/hw/mthca/mthca_provider.h
+++ b/drivers/infiniband/hw/mthca/mthca_provider.h
@@ -214,6 +214,7 @@ struct mthca_cq {
         int                     arm_sn;
 
         wait_queue_head_t       wait;
+        struct mutex            mutex;
 };
 
 struct mthca_srq {
@@ -237,6 +238,7 @@ struct mthca_srq {
         struct mthca_mr         mr;
 
         wait_queue_head_t       wait;
+        struct mutex            mutex;
 };
 
 struct mthca_wq {
@@ -278,6 +280,7 @@ struct mthca_qp {
         union mthca_buf        queue;
 
         wait_queue_head_t      wait;
+        struct mutex           mutex;
 };
 
 struct mthca_sqp {