Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 20 insertions, 13 deletions

diff --git a/drivers/net/mlx4/alloc.c b/drivers/net/mlx4/alloc.c
index 8c8515619b8e..116cae334dad 100644
--- a/drivers/net/mlx4/alloc.c
+++ b/drivers/net/mlx4/alloc.c
@@ -62,6 +62,9 @@ u32 mlx4_bitmap_alloc(struct mlx4_bitmap *bitmap)
         } else
                 obj = -1;
 
+        if (obj != -1)
+                --bitmap->avail;
+
         spin_unlock(&bitmap->lock);
 
         return obj;
@@ -74,7 +77,7 @@ void mlx4_bitmap_free(struct mlx4_bitmap *bitmap, u32 obj)
 
 u32 mlx4_bitmap_alloc_range(struct mlx4_bitmap *bitmap, int cnt, int align)
 {
-        u32 obj, i;
+        u32 obj;
 
         if (likely(cnt == 1 && align == 1))
                 return mlx4_bitmap_alloc(bitmap);
@@ -91,8 +94,7 @@ u32 mlx4_bitmap_alloc_range(struct mlx4_bitmap *bitmap, int cnt, int align)
         }
 
         if (obj < bitmap->max) {
-                for (i = 0; i < cnt; i++)
-                        set_bit(obj + i, bitmap->table);
+                bitmap_set(bitmap->table, obj, cnt);
                 if (obj == bitmap->last) {
                         bitmap->last = (obj + cnt);
                         if (bitmap->last >= bitmap->max)
@@ -102,31 +104,35 @@ u32 mlx4_bitmap_alloc_range(struct mlx4_bitmap *bitmap, int cnt, int align)
         } else
                 obj = -1;
 
+        if (obj != -1)
+                bitmap->avail -= cnt;
+
         spin_unlock(&bitmap->lock);
 
         return obj;
 }
 
-void mlx4_bitmap_free_range(struct mlx4_bitmap *bitmap, u32 obj, int cnt)
+u32 mlx4_bitmap_avail(struct mlx4_bitmap *bitmap)
 {
-        u32 i;
+        return bitmap->avail;
+}
 
+void mlx4_bitmap_free_range(struct mlx4_bitmap *bitmap, u32 obj, int cnt)
+{
         obj &= bitmap->max + bitmap->reserved_top - 1;
 
         spin_lock(&bitmap->lock);
-        for (i = 0; i < cnt; i++)
-                clear_bit(obj + i, bitmap->table);
+        bitmap_clear(bitmap->table, obj, cnt);
         bitmap->last = min(bitmap->last, obj);
         bitmap->top = (bitmap->top + bitmap->max + bitmap->reserved_top)
                         & bitmap->mask;
+        bitmap->avail += cnt;
         spin_unlock(&bitmap->lock);
 }
 
 int mlx4_bitmap_init(struct mlx4_bitmap *bitmap, u32 num, u32 mask,
                      u32 reserved_bot, u32 reserved_top)
 {
-        int i;
-
         /* num must be a power of 2 */
         if (num != roundup_pow_of_two(num))
                 return -EINVAL;
@@ -136,14 +142,14 @@ int mlx4_bitmap_init(struct mlx4_bitmap *bitmap, u32 num, u32 mask,
         bitmap->max  = num - reserved_top;
         bitmap->mask = mask;
         bitmap->reserved_top = reserved_top;
+        bitmap->avail = num - reserved_top - reserved_bot;
         spin_lock_init(&bitmap->lock);
         bitmap->table = kzalloc(BITS_TO_LONGS(bitmap->max) *
                                 sizeof (long), GFP_KERNEL);
         if (!bitmap->table)
                 return -ENOMEM;
 
-        for (i = 0; i < reserved_bot; ++i)
-                set_bit(i, bitmap->table);
+        bitmap_set(bitmap->table, 0, reserved_bot);
 
         return 0;
 }
@@ -185,10 +191,11 @@ int mlx4_buf_alloc(struct mlx4_dev *dev, int size, int max_direct,
         } else {
                 int i;
 
+                buf->direct.buf  = NULL;
                 buf->nbufs       = (size + PAGE_SIZE - 1) / PAGE_SIZE;
                 buf->npages      = buf->nbufs;
                 buf->page_shift  = PAGE_SHIFT;
-                buf->page_list   = kzalloc(buf->nbufs * sizeof *buf->page_list,
+                buf->page_list   = kcalloc(buf->nbufs, sizeof(*buf->page_list),
                                            GFP_KERNEL);
                 if (!buf->page_list)
                         return -ENOMEM;
@@ -236,7 +243,7 @@ void mlx4_buf_free(struct mlx4_dev *dev, int size, struct mlx4_buf *buf)
                 dma_free_coherent(&dev->pdev->dev, size, buf->direct.buf,
                                   buf->direct.map);
         else {
-                if (BITS_PER_LONG == 64)
+                if (BITS_PER_LONG == 64 && buf->direct.buf)
                         vunmap(buf->direct.buf);
 
                 for (i = 0; i < buf->nbufs; ++i)