please pull infiniband.git
Linus, please pull from
master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This tree is also available from kernel.org mirrors at:
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
to get a fix for a locking bug found by lockdep:
Roland Dreier:
IB/mthca: Use IRQ safe locks to protect allocation bitmaps
drivers/infiniband/hw/mthca/mthca_allocator.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-)
drivers/infiniband/hw/mthca/mthca_allocator.c +11 -4
@@ -41,9 +41,11 @@ #include "mthca_dev.h"/* 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 +58,24 @@ u32 mthca_alloc(struct mthca_alloc *allo }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,