[PATCH] IB/mthca: encapsulate MTT buddy allocator

Encapsulate the buddy allocator used for MTT segments.  This cleans up the
code and also gets us ready to add FMR support.

Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/infiniband/hw/mthca/mthca_dev.h b/drivers/infiniband/hw/mthca/mthca_dev.h
index d4bd9aa232b1..1faaf542a4e1 100644
--- a/drivers/infiniband/hw/mthca/mthca_dev.h
+++ b/drivers/infiniband/hw/mthca/mthca_dev.h
@@ -170,10 +170,15 @@ struct mthca_pd_table {
         struct mthca_alloc alloc;
 };
 
+struct mthca_buddy {
+        unsigned long **bits;
+        int             max_order;
+        spinlock_t      lock;
+};
+
 struct mthca_mr_table {
         struct mthca_alloc      mpt_alloc;
-        int                     max_mtt_order;
-        unsigned long         **mtt_buddy;
+        struct mthca_buddy      mtt_buddy;
         u64                     mtt_base;
         struct mthca_icm_table *mtt_table;
         struct mthca_icm_table *mpt_table;