diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-11-18 05:13:23 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-11-18 05:13:23 +0300 |
| commit | 05909cd9a0c8811731b38697af13075e8954314f (patch) | |
| tree | aa5306e756666407c95067b20b21b32ff27fd11a /include/linux/virtio_ring.h | |
| parent | c7f0169e3bd274e576f6aaeee86ad2adf7bb14b5 (diff) | |
| parent | bbf5c979011a099af5dc76498918ed7df445635b (diff) | |
| download | linux-05909cd9a0c8811731b38697af13075e8954314f.tar.xz | |
Merge tag 'v5.9' into next
Sync up with mainline to bring in the latest DTS files.
Diffstat (limited to 'include/linux/virtio_ring.h')
| -rw-r--r-- | include/linux/virtio_ring.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/include/linux/virtio_ring.h b/include/linux/virtio_ring.h index 3dc70adfe5f5..b485b13fa50b 100644 --- a/include/linux/virtio_ring.h +++ b/include/linux/virtio_ring.h @@ -46,16 +46,15 @@ static inline void virtio_wmb(bool weak_barriers) dma_wmb(); } -static inline void virtio_store_mb(bool weak_barriers, - __virtio16 *p, __virtio16 v) -{ - if (weak_barriers) { - virt_store_mb(*p, v); - } else { - WRITE_ONCE(*p, v); - mb(); - } -} +#define virtio_store_mb(weak_barriers, p, v) \ +do { \ + if (weak_barriers) { \ + virt_store_mb(*p, v); \ + } else { \ + WRITE_ONCE(*p, v); \ + mb(); \ + } \ +} while (0) \ struct virtio_device; struct virtqueue; |