diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-29 11:39:34 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-29 11:39:34 -0400 |
| commit | 83b7a664a0c7c39ccfa4c72535dc1c001d4e7a18 (patch) | |
| tree | 5ba3bbbe977c2047658b41e22d6b2abd5686bf15 /drivers/infiniband/hw/mthca/mthca_provider.h | |
| parent | 8638460540749ddb1beca9e9a68d655a6fe6df65 (diff) | |
| parent | d96299537e43681942ea272e00b0e529aa5b5fa4 (diff) | |
| download | lwn-83b7a664a0c7c39ccfa4c72535dc1c001d4e7a18.tar.gz lwn-83b7a664a0c7c39ccfa4c72535dc1c001d4e7a18.zip | |
Merge branch 'master' into gfs2
Diffstat (limited to 'drivers/infiniband/hw/mthca/mthca_provider.h')
| -rw-r--r-- | drivers/infiniband/hw/mthca/mthca_provider.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_provider.h b/drivers/infiniband/hw/mthca/mthca_provider.h index 8de2887ba15c..9a5bece3fa5c 100644 --- a/drivers/infiniband/hw/mthca/mthca_provider.h +++ b/drivers/infiniband/hw/mthca/mthca_provider.h @@ -136,8 +136,8 @@ struct mthca_ah { * We have one global lock that protects dev->cq/qp_table. Each * struct mthca_cq/qp also has its own lock. An individual qp lock * may be taken inside of an individual cq lock. Both cqs attached to - * a qp may be locked, with the send cq locked first. No other - * nesting should be done. + * a qp may be locked, with the cq with the lower cqn locked first. + * No other nesting should be done. * * Each struct mthca_cq/qp also has an ref count, protected by the * corresponding table lock. The pointer from the cq/qp_table to the |