diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-02-08 05:03:11 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-02-08 05:03:11 +0100 |
| commit | d5112a4f31a361409d3c57dc9d58dd69f8014bef (patch) | |
| tree | 64771300b2191cb94d9aaf60355661a01c2ccd1a /drivers/infiniband/hw/ehca/ehca_cq.c | |
| parent | [POWERPC] Only use H_BULK_REMOVE if the firmware supports it (diff) | |
| parent | [POWERPC] Fixup error handling when emulating a floating point instruction (diff) | |
| download | linux-d5112a4f31a361409d3c57dc9d58dd69f8014bef.tar.xz linux-d5112a4f31a361409d3c57dc9d58dd69f8014bef.zip | |
Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.21
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 93995b658d94..6074c897f51c 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); |