Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[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 9a5bece3fa5c28eaf9ffb1fda134cb8785d39cac..934bf9544037c582aaeb60754d78ad534aef618c 100644 (file)
--- a/drivers/infiniband/hw/mthca/mthca_provider.h
+++ b/drivers/infiniband/hw/mthca/mthca_provider.h
@@ -67,12 +67,14 @@ struct mthca_ucontext {
        struct ib_ucontext          ibucontext;
        struct mthca_uar            uar;
        struct mthca_user_db_table *db_tab;
+       int                         reg_mr_warned;
 };
 
 struct mthca_mtt;
 
 struct mthca_mr {
        struct ib_mr      ibmr;
+       struct ib_umem   *umem;
        struct mthca_mtt *mtt;
 };
 
@@ -89,6 +91,7 @@ struct mthca_fmr {
                struct {
                        struct mthca_mpt_entry *mpt;
                        __be64 *mtts;
+                       dma_addr_t dma_handle;
                } arbel;
        } mem;
 };