diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-23 11:13:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-23 11:13:06 -0800 |
| commit | 821836e5baa69b8bc80605f25ad963e721609bc0 (patch) | |
| tree | 0d09c66706e2abdb460c4ab32133b1a49ad7a304 /drivers/infiniband/hw/ehca/ehca_cq.c | |
| parent | 73f66ace34e3d935d1ad01208234f8871ac1f500 (diff) | |
| parent | cea9ea67e9927da18af89b49bd949a8d65ba1b15 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
IB/ehca: Fix mismatched spin_unlock in irq handler
IB/ehca: Fix improper use of yield() with spinlock held
IB/srp: Check match_strdup() return
Diffstat (limited to 'drivers/infiniband/hw/ehca/ehca_cq.c')
| -rw-r--r-- | drivers/infiniband/hw/ehca/ehca_cq.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/ehca/ehca_cq.c b/drivers/infiniband/hw/ehca/ehca_cq.c index 93995b658d9..6074c897f51 100644 --- a/drivers/infiniband/hw/ehca/ehca_cq.c +++ b/drivers/infiniband/hw/ehca/ehca_cq.c @@ -344,8 +344,11 @@ int ehca_destroy_cq(struct ib_cq *cq) unsigned long flags; spin_lock_irqsave(&ehca_cq_idr_lock, flags); - while (my_cq->nr_callbacks) + while (my_cq->nr_callbacks) { + spin_unlock_irqrestore(&ehca_cq_idr_lock, flags); yield(); + spin_lock_irqsave(&ehca_cq_idr_lock, flags); + } idr_remove(&ehca_cq_idr, my_cq->token); spin_unlock_irqrestore(&ehca_cq_idr_lock, flags); |