summaryrefslogtreecommitdiffstats
path: root/drivers/vhost/vringh.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/vhost/vringh.c')
-rw-r--r--drivers/vhost/vringh.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
index 3bb02c60a2f5..bb8971f2a634 100644
--- a/drivers/vhost/vringh.c
+++ b/drivers/vhost/vringh.c
@@ -3,6 +3,7 @@
3 * 3 *
4 * Since these may be in userspace, we use (inline) accessors. 4 * Since these may be in userspace, we use (inline) accessors.
5 */ 5 */
6#include <linux/compiler.h>
6#include <linux/module.h> 7#include <linux/module.h>
7#include <linux/vringh.h> 8#include <linux/vringh.h>
8#include <linux/virtio_ring.h> 9#include <linux/virtio_ring.h>
@@ -820,13 +821,13 @@ EXPORT_SYMBOL(vringh_need_notify_user);
820static inline int getu16_kern(const struct vringh *vrh, 821static inline int getu16_kern(const struct vringh *vrh,
821 u16 *val, const __virtio16 *p) 822 u16 *val, const __virtio16 *p)
822{ 823{
823 *val = vringh16_to_cpu(vrh, ACCESS_ONCE(*p)); 824 *val = vringh16_to_cpu(vrh, READ_ONCE(*p));
824 return 0; 825 return 0;
825} 826}
826 827
827static inline int putu16_kern(const struct vringh *vrh, __virtio16 *p, u16 val) 828static inline int putu16_kern(const struct vringh *vrh, __virtio16 *p, u16 val)
828{ 829{
829 ACCESS_ONCE(*p) = cpu_to_vringh16(vrh, val); 830 WRITE_ONCE(*p, cpu_to_vringh16(vrh, val));
830 return 0; 831 return 0;
831} 832}
832 833