diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 18:31:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 18:31:02 -0400 |
| commit | 3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4 (patch) | |
| tree | 5adc1ff2eaf64d450bf28bb6b2ce890db2567288 /drivers/infiniband/hw/cxgb3 | |
| parent | 5cf65713f87775c548e3eb48dbafa32e12f28000 (diff) | |
| parent | 0ea6e61122196509af82cc4f36cbdaacbefb8227 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (48 commits)
Documentation: update broken web addresses.
fix comment typo "choosed" -> "chosen"
hostap:hostap_hw.c Fix typo in comment
Fix spelling contorller -> controller in comments
Kconfig.debug: FAIL_IO_TIMEOUT: typo Faul -> Fault
fs/Kconfig: Fix typo Userpace -> Userspace
Removing dead MACH_U300_BS26
drivers/infiniband: Remove unnecessary casts of private_data
fs/ocfs2: Remove unnecessary casts of private_data
libfc: use ARRAY_SIZE
scsi: bfa: use ARRAY_SIZE
drm: i915: use ARRAY_SIZE
drm: drm_edid: use ARRAY_SIZE
synclink: use ARRAY_SIZE
block: cciss: use ARRAY_SIZE
comment typo fixes: charater => character
fix comment typos concerning "challenge"
arm: plat-spear: fix typo in kerneldoc
reiserfs: typo comment fix
update email address
...
Diffstat (limited to 'drivers/infiniband/hw/cxgb3')
| -rw-r--r-- | drivers/infiniband/hw/cxgb3/iwch_qp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/cxgb3/iwch_qp.c b/drivers/infiniband/hw/cxgb3/iwch_qp.c index ae47bfd22bd5..9bbb65bba67e 100644 --- a/drivers/infiniband/hw/cxgb3/iwch_qp.c +++ b/drivers/infiniband/hw/cxgb3/iwch_qp.c | |||
| @@ -816,7 +816,7 @@ static void __flush_qp(struct iwch_qp *qhp, unsigned long *flag) | |||
| 816 | atomic_inc(&qhp->refcnt); | 816 | atomic_inc(&qhp->refcnt); |
| 817 | spin_unlock_irqrestore(&qhp->lock, *flag); | 817 | spin_unlock_irqrestore(&qhp->lock, *flag); |
| 818 | 818 | ||
| 819 | /* locking heirarchy: cq lock first, then qp lock. */ | 819 | /* locking hierarchy: cq lock first, then qp lock. */ |
| 820 | spin_lock_irqsave(&rchp->lock, *flag); | 820 | spin_lock_irqsave(&rchp->lock, *flag); |
| 821 | spin_lock(&qhp->lock); | 821 | spin_lock(&qhp->lock); |
| 822 | cxio_flush_hw_cq(&rchp->cq); | 822 | cxio_flush_hw_cq(&rchp->cq); |
| @@ -827,7 +827,7 @@ static void __flush_qp(struct iwch_qp *qhp, unsigned long *flag) | |||
| 827 | if (flushed) | 827 | if (flushed) |
| 828 | (*rchp->ibcq.comp_handler)(&rchp->ibcq, rchp->ibcq.cq_context); | 828 | (*rchp->ibcq.comp_handler)(&rchp->ibcq, rchp->ibcq.cq_context); |
| 829 | 829 | ||
| 830 | /* locking heirarchy: cq lock first, then qp lock. */ | 830 | /* locking hierarchy: cq lock first, then qp lock. */ |
| 831 | spin_lock_irqsave(&schp->lock, *flag); | 831 | spin_lock_irqsave(&schp->lock, *flag); |
| 832 | spin_lock(&qhp->lock); | 832 | spin_lock(&qhp->lock); |
| 833 | cxio_flush_hw_cq(&schp->cq); | 833 | cxio_flush_hw_cq(&schp->cq); |