diff options
| author | Thomas Gleixner | 2017-11-14 10:01:49 +0100 |
|---|---|---|
| committer | Thomas Gleixner | 2017-11-14 10:01:49 +0100 |
| commit | d4bfeabe9ff7967f4b8c24aabf2de1ce3a909cd9 (patch) | |
| tree | 6b419b8497c7d57ddec20a3558697ef36ea37b11 /drivers/infiniband/hw/hfi1/sdma.h | |
| parent | timekeeping: Eliminate the stale declaration of ktime_get_raw_and_real_ts64() (diff) | |
| parent | x86 / CPU: Avoid unnecessary IPIs in arch_freq_get_on_cpu() (diff) | |
| download | kernel-qcow2-linux-d4bfeabe9ff7967f4b8c24aabf2de1ce3a909cd9.tar.gz kernel-qcow2-linux-d4bfeabe9ff7967f4b8c24aabf2de1ce3a909cd9.tar.xz kernel-qcow2-linux-d4bfeabe9ff7967f4b8c24aabf2de1ce3a909cd9.zip | |
Merge branch 'linus' into timers/urgent
Get upstream changes so dependent patches can be applied.
Diffstat (limited to 'drivers/infiniband/hw/hfi1/sdma.h')
| -rw-r--r-- | drivers/infiniband/hw/hfi1/sdma.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/hfi1/sdma.h b/drivers/infiniband/hw/hfi1/sdma.h index 107011d8613b..374c59784950 100644 --- a/drivers/infiniband/hw/hfi1/sdma.h +++ b/drivers/infiniband/hw/hfi1/sdma.h @@ -445,7 +445,7 @@ static inline u16 sdma_descq_freecnt(struct sdma_engine *sde) { return sde->descq_cnt - (sde->descq_tail - - ACCESS_ONCE(sde->descq_head)) - 1; + READ_ONCE(sde->descq_head)) - 1; } static inline u16 sdma_descq_inprocess(struct sdma_engine *sde) |