Merge branch 'devel' into next

[pandora-kernel.git] / drivers / infiniband / hw / mthca / mthca_allocator.c

diff --git a/drivers/infiniband/hw/mthca/mthca_allocator.c b/drivers/infiniband/hw/mthca/mthca_allocator.c
index 25157f5..c5ccc2d 100644 (file)
--- a/drivers/infiniband/hw/mthca/mthca_allocator.c
+++ b/drivers/infiniband/hw/mthca/mthca_allocator.c
@@ -28,8 +28,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id: mthca_allocator.c 1349 2004-12-16 21:09:43Z roland $
  */
 
 #include <linux/errno.h>
@@ -41,9 +39,11 @@
 /* Trivial bitmap-based allocator */
 u32 mthca_alloc(struct mthca_alloc *alloc)
 {
+       unsigned long flags;
        u32 obj;
 
-       spin_lock(&alloc->lock);
+       spin_lock_irqsave(&alloc->lock, flags);
+
        obj = find_next_zero_bit(alloc->table, alloc->max, alloc->last);
        if (obj >= alloc->max) {
                alloc->top = (alloc->top + alloc->max) & alloc->mask;
@@ -56,19 +56,24 @@ u32 mthca_alloc(struct mthca_alloc *alloc)
        } else
                obj = -1;
 
-       spin_unlock(&alloc->lock);
+       spin_unlock_irqrestore(&alloc->lock, flags);
 
        return obj;
 }
 
 void mthca_free(struct mthca_alloc *alloc, u32 obj)
 {
+       unsigned long flags;
+
        obj &= alloc->max - 1;
-       spin_lock(&alloc->lock);
+
+       spin_lock_irqsave(&alloc->lock, flags);
+
        clear_bit(obj, alloc->table);
        alloc->last = min(alloc->last, obj);
        alloc->top = (alloc->top + alloc->max) & alloc->mask;
-       spin_unlock(&alloc->lock);
+
+       spin_unlock_irqrestore(&alloc->lock, flags);
 }
 
 int mthca_alloc_init(struct mthca_alloc *alloc, u32 num, u32 mask,
@@ -248,7 +253,7 @@ int mthca_buf_alloc(struct mthca_dev *dev, int size, int max_direct,
                        dma_list[i] = t;
                        pci_unmap_addr_set(&buf->page_list[i], mapping, t);
 
-                       memset(buf->page_list[i].buf, 0, PAGE_SIZE);
+                       clear_page(buf->page_list[i].buf);
                }
        }