Merge branch 'irq-cleanups-upstream' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6] / drivers / infiniband / hw / mthca / mthca_provider.h

diff --git a/drivers/infiniband/hw/mthca/mthca_provider.h b/drivers/infiniband/hw/mthca/mthca_provider.h
index 8de2887ba15ce090ef9ea4297a634c5067244aaf..262616c8ebb644d75ab603e5ce12b5f668baa5ac 100644 (file)
--- a/drivers/infiniband/hw/mthca/mthca_provider.h
+++ b/drivers/infiniband/hw/mthca/mthca_provider.h
@@ -73,6 +73,7 @@ struct mthca_mtt;
 
 struct mthca_mr {
        struct ib_mr      ibmr;
+       struct ib_umem   *umem;
        struct mthca_mtt *mtt;
 };
 
@@ -89,6 +90,7 @@ struct mthca_fmr {
                struct {
                        struct mthca_mpt_entry *mpt;
                        __be64 *mtts;
+                       dma_addr_t dma_handle;
                } arbel;
        } mem;
 };
@@ -136,8 +138,8 @@ struct mthca_ah {
  * We have one global lock that protects dev->cq/qp_table.  Each
  * struct mthca_cq/qp also has its own lock.  An individual qp lock
  * may be taken inside of an individual cq lock.  Both cqs attached to
- * a qp may be locked, with the send cq locked first.  No other
- * nesting should be done.
+ * a qp may be locked, with the cq with the lower cqn locked first.
+ * No other nesting should be done.
  *
  * Each struct mthca_cq/qp also has an ref count, protected by the
  * corresponding table lock.  The pointer from the cq/qp_table to the